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 61c7ac1..2622c81 100644 (file)
--- 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 fb3ae0e..b220fb7 100644 (file)
--- 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 b11da41..dbefa9c 100644 (file)
--- 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 (file)
index 0000000..2466e70
--- /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\r
+Connection: close\r
+Content-Length: 0\r
+\r
+</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\r
+Connection: close\r
+Content-Length: 0\r
+\r
+</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\r
+Range: bytes=100-\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
+</protocol>
+</verify>
+</testcase>

diff --git a/tests/data/test1041 b/tests/data/test1041
new file mode 100644 (file)
index 0000000..825cdaf
--- /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\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Accept-Ranges: bytes\r
+Content-Length: 0\r
+Connection: close\r
+Content-Type: text/html\r
+\r
+</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\r
+Content-Range: bytes 0-99/100\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+Content-Length: 100\r
+Expect: 100-continue\r
+\r
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+</protocol>
+</verify>
+</testcase>