From: Dan Fandrich <dan@coneharvesters.com> Date: Tue, 15 Jul 2008 03:36:38 +0000 (+0000) Subject: Added test1040 and test1041 to test -C - on HTTP. Test 1041 failed so it's X-Git-Tag: cares-1_5_3~354 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69a03ce23ca24054f9a3c6f65f5b139539fc929c;p=curl Added test1040 and test1041 to test -C - on HTTP. Test 1041 failed so it's added to DISABLED. --- diff --git a/CHANGES b/CHANGES index 61c7ac177..2622c81d7 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,10 @@ Changelog +Daniel Fandrich (14 Jul 2008) +- Added test1040 and test1041 to test -C - on HTTP. Test 1041 failed so it's + added to DISABLED. + Yang Tse (14 Jul 2008) - HTTP_ONLY definition check in lib/setup.h is now done once that configuration file has been included. In this way if symbol is defined in the config file diff --git a/tests/data/DISABLED b/tests/data/DISABLED index fb3ae0ec9..b220fb713 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -3,4 +3,4 @@ # test cases are run by runtests.pl. Just add the plain test case numbers, one # per line. # Lines starting with '#' letters are treated as comments. - +1041 diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index b11da41df..dbefa9ca0 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -51,8 +51,9 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test1021 test1022 test1023 test309 test616 test617 test618 test619 \ test620 test621 test622 test623 test624 test625 test626 test627 test554 \ test1024 test1025 test555 test1026 test1027 test1028 test1029 test1030 \ - test556 test1031 test628 test629 test630 test631 test632 test1032 test1033 \ - test539 test1034 test1035 test1036 test1037 test1038 test1039 + test556 test1031 test628 test629 test630 test631 test632 test1032 \ + test1033 test539 test1034 test1035 test1036 test1037 test1038 test1039 \ + test1040 test1041 filecheck: @mkdir test-place; \ diff --git a/tests/data/test1040 b/tests/data/test1040 new file mode 100644 index 000000000..2466e7050 --- /dev/null +++ b/tests/data/test1040 @@ -0,0 +1,79 @@ +<testcase> +# Similar to test92 +<info> +<keywords> +HTTP +HTTP GET +Resume +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 416 Invalid range +Connection: close +Content-Length: 0 + +</data> + +# The file data that exists at the start of the test must be included in +# the verification. +<datacheck> +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +HTTP/1.1 416 Invalid range +Connection: close +Content-Length: 0 + +</datacheck> + +</reply> + +# Client-side +<client> +<server> +http +</server> + <name> +HTTP GET with resume from end of entirely-downloaded file + </name> + <command> +http://%HOSTIP:%HTTPPORT/1040 -C - +</command> +<file name="log/curl1040.out"> +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +</file> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1040 HTTP/1.1 +Range: bytes=100- +Host: %HOSTIP:%HTTPPORT +Accept: */* + +</protocol> +</verify> +</testcase> diff --git a/tests/data/test1041 b/tests/data/test1041 new file mode 100644 index 000000000..825cdaf32 --- /dev/null +++ b/tests/data/test1041 @@ -0,0 +1,75 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP PUT +Resume +Content-Range +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 OK swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Accept-Ranges: bytes +Content-Length: 0 +Connection: close +Content-Type: text/html + +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> + <name> +HTTP PUT with resume from end of already-uploaded file + </name> +<file name="log/test1041.txt"> +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +</file> + <command> +http://%HOSTIP:%HTTPPORT/1041 -Tlog/test1041.txt -C - +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +PUT /1041 HTTP/1.1 +Content-Range: bytes 0-99/100 +Host: %HOSTIP:%HTTPPORT +Accept: */* +Content-Length: 100 +Expect: 100-continue + +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +012345678 +</protocol> +</verify> +</testcase>