diff options
author | Alessandro Ghedini <alessandro@ghedini.me> | 2013-04-22 20:07:15 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2013-04-22 22:46:47 +0200 |
commit | d791179d7f900cccab9f68fc8e8f2331179a8edb (patch) | |
tree | d0dae31ca08709b1785f6e23f0fa4eec7a5a7f49 | |
parent | c49ed0b6c0fad21b77fe8d17d7b5bef182c5ecdf (diff) |
tests: add test1511 to check timecond clean-up
Verifies the timecond fix in commit c49ed0b6c0f
-rw-r--r-- | tests/data/Makefile.am | 2 | ||||
-rw-r--r-- | tests/data/test1511 | 62 | ||||
-rw-r--r-- | tests/libtest/Makefile.inc | 6 | ||||
-rw-r--r-- | tests/libtest/lib1511.c | 73 |
4 files changed, 141 insertions, 2 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 875a35d3a..7ec47f895 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -109,7 +109,7 @@ test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \ test1408 test1409 test1410 test1411 test1412 test1413 \ \ test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ -test1508 test1509 test1510 \ +test1508 test1509 test1510 test1511 \ \ test1900 test1901 test1902 test1903 \ \ diff --git a/tests/data/test1511 b/tests/data/test1511 new file mode 100644 index 000000000..947ad26da --- /dev/null +++ b/tests/data/test1511 @@ -0,0 +1,62 @@ +<testcase> +<info> +<keywords> +HTTP +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fakem +Last-Modified: Mon, 22 Apr 2013 17:45:05 GMT
+Content-Type: text/html
+Content-Length: 12
+Connection: close
+
+Hello World +</data> + +<datacheck> +HTTP/1.1 200
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fakem +Last-Modified: Mon, 22 Apr 2013 17:45:05 GMT
+Content-Type: text/html
+Content-Length: 12
+Connection: close
+
+HTTP/1.1 200
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fakem +Last-Modified: Mon, 22 Apr 2013 17:45:05 GMT
+Content-Type: text/html
+Content-Length: 12
+Connection: close
+
+Hello World +</datacheck> + +</reply> + +# Client-side +<client> +<server> +http +</server> +<features> +http +</features> +<tool> +lib1511 +</tool> +<name> +HTTP GET time conditions in repeated requests +</name> +<command> +http://%HOSTIP:%HTTPPORT/1511 +</command> +</client> +</testcase> diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 04de1d79d..664e00063 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -21,7 +21,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib571 lib572 lib573 lib574 lib575 lib576 lib578 lib579 lib582 \ lib583 lib585 lib586 lib587 lib590 lib591 lib597 lib598 lib599 \ lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \ - lib1509 lib1510 \ + lib1509 lib1510 lib1511 \ lib1900 \ lib2033 @@ -335,6 +335,10 @@ lib1510_SOURCES = lib1510.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1510_LDADD = $(TESTUTIL_LIBS) lib1510_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1510 +lib1511_SOURCES = lib1511.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1511_LDADD = $(TESTUTIL_LIBS) +lib1511_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1511 + lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1900_LDADD = $(TESTUTIL_LIBS) lib1900_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/lib1511.c b/tests/libtest/lib1511.c new file mode 100644 index 000000000..c75a8c271 --- /dev/null +++ b/tests/libtest/lib1511.c @@ -0,0 +1,73 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "testtrace.h" +#include "memdebug.h" + +int test(char *URL) +{ + int i = -1; + long unmet; + CURLcode res = 0; + CURL* curl = NULL; + + global_init(CURL_GLOBAL_ALL); + easy_init(curl); + + easy_setopt(curl, CURLOPT_URL, URL); + easy_setopt(curl, CURLOPT_HEADER, 1L); + easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + + /* TIMEVALUE in the future */ + easy_setopt(curl, CURLOPT_TIMEVALUE, 1566210680); + + res = curl_easy_perform(curl); + if(res != CURLE_OK) + goto test_cleanup; + + curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &unmet); + if(unmet != 1) + goto test_cleanup; + + /* TIMEVALUE in the past */ + easy_setopt(curl, CURLOPT_TIMEVALUE, 1); + + res = curl_easy_perform(curl); + if (res != CURLE_OK) + goto test_cleanup; + + curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &unmet); + if(unmet != 0) + goto test_cleanup; + + i = 0; + +test_cleanup: + if(res) + i = res; + + curl_easy_cleanup(curl); + curl_global_cleanup(); + + return i; /* return the final return code */ +} |