diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2006-10-09 06:58:05 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2006-10-09 06:58:05 +0000 |
| commit | a1de9367ecc17ae1d77e46b76fb1aba6c9f3ccb2 (patch) | |
| tree | 93b73d1132cd1fd9bf234cb5989b5fb9f5fb8712 /tests | |
| parent | eceb37bde2a0a5ce6be3a141d8d420be28a12fa0 (diff) | |
Bogdan Nicula's second test case (posted Sun, 08 Oct 2006) converted to test
case 535 and it now runs fine. Again a problem with the pipelining code not
taking all possible (error) conditions into account.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/data/test535 | 59 | ||||
| -rw-r--r-- | tests/libtest/lib533.c | 4 |
3 files changed, 62 insertions, 3 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 1fd5b7f0f..ffb392f01 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -36,4 +36,4 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test265 test266 test267 test268 test269 test270 test271 test272 test273 \ test274 test275 test524 test525 test276 test277 test526 test527 test528 \ test530 DISABLED test278 test279 test531 test280 test529 test532 test533 \ - test534 + test534 test535 diff --git a/tests/data/test535 b/tests/data/test535 new file mode 100644 index 000000000..ea43a1ab6 --- /dev/null +++ b/tests/data/test535 @@ -0,0 +1,59 @@ +<reply> +<data mode="text"> +HTTP/1.1 404 Badness +Date: Thu, 09 Nov 2010 14:49:00 GMT +ETag: "21025-dc7-39462498" +Content-Length: 6 +Content-Type: text/html +Funny-head: yesyes + +hejsan +</data> +<data1> +HTTP/1.1 200 Fine +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 13 +Connection: close +Content-Type: text/html + +fine content +</data1> + +<datacheck> +fine content +</datacheck> + +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib533 +</tool> + + <name> +HTTP GET multi two files with FAILONERROR + </name> + <command> +http://%HOSTIP:%HTTPPORT/535 http://%HOSTIP:%HTTPPORT/5350001 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +GET /535 HTTP/1.1
+Host: 127.0.0.1:%HTTPPORT
+Accept: */*
+
+GET /5350001 HTTP/1.1
+Host: 127.0.0.1:%HTTPPORT
+Accept: */*
+
+</protocol> +</verify> diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c index afbb7bd27..3a1e7dff6 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -34,9 +34,8 @@ int test(char *URL) return 100 + i; /* major bad */ curl_easy_setopt(curl, CURLOPT_URL, URL); - - /* go verbose */ curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1); m = curl_multi_init(); @@ -65,6 +64,7 @@ int test(char *URL) curl_easy_reset(curl); curl_easy_setopt(curl, CURLOPT_URL, arg2); curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1); /* re-add it */ res = (int)curl_multi_add_handle(m, curl); |