Convert (most of) the test data files into genuine XML. A handful still

are not, due mainly to the lack of support for XML character entities
(e.g. & => & ).  This will make it easier to validate test files using
tools like xmllint, as well as edit and view them using XML tools.

diff --git a/CHANGES b/CHANGES
index 22d356454e05745c95d8ea56e3a9ec9fd5353fa4..07e0bcb271a5dc843fe3fa23570317e8b8752b35 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@
 
                                   Changelog
 
+Dan F (22 January 2007)
+- Converted (most of) the test data files into genuine XML.  A handful still
+  are not, due mainly to the lack of support for XML character entities
+  (e.g. & => & ).  This will make it easier to validate test files using
+  tools like xmllint, as well as to edit and view them using XML tools.
+
 Daniel (16 January 2007)
 - Armel Asselin improved libcurl to behave a lot better when an easy handle
   doing an FTP transfer is removed from a multi handle before completion. The

diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 594addb13196aed2f7b44ee0583ae9036b533870..22c8f5807b720a691979f2766572af380c07e5be 100644 (file)
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -1,7 +1,16 @@
- The file format of the test suite is a very simple and extendable format. All
-data for a single test case resides in a single ASCII file. Labels mark the
-beginning and the end of all sections. Each label must be written in its own
-line and is resembling XML/HTML.
+ The test suite's file format is very simple and extendable, closely
+resembling XML. All data for a single test case resides in a single
+ASCII file. Labels mark the beginning and the end of all sections, and each
+label must be written in its own line.  Comments are either XML-style
+(enclosed with <!-- and -->) or C-style (beginning with #) and must appear
+on their own lines and not alongside actual test data.  Most test data files
+are syntactically valid XML, although a few files are not (lack of
+support for character entities is the biggest omission).
+
+ The file begins with a 'testcase' tag, which encompasses the remainder of
+the file.
+
+<testcase>
 
  Each file is split up in three main sections: reply, client and verify. The
 reply section is used for the server to know what to send as a reply for the
@@ -24,14 +33,14 @@ statistical/informational purposes.
 </info>
 
 <reply>
-<data [nocheck=1] [sendzero=yes] [base64=yes]>
-§data to sent to the client on its request and later verified that it arrived
+<data [nocheck="1"] [sendzero="yes"] [base64="yes"]>
+data to be sent to the client on its request and later verified that it arrived
 safely. Set the nocheck=1 to prevent the test script to verify the arrival
 of this data.
 
 If the data contains 'swsclose' anywhere within the start and end tag, and
 this is a HTTP test, then the connection will be closed by the server after
-this response is sent. If not, the connection will be kept persistant.
+this response is sent. If not, the connection will be kept persistent.
 
 If the data contains 'swsbounce' anywhere within the start and end tag, the
 HTTP server will detect if this is a second request using the same test and
@@ -55,7 +64,7 @@ B) The request was HTTP and included digest details, which adds 1000 to NUM
 C) If a HTTP request is NTLM type-1, it adds 1001 to num
 D) If a HTTP request is NTLM type-3, it adds 1002 to num
 </dataNUM>
-<datacheck [nonewline=yes]>
+<datacheck [nonewline="yes"]>
 if the data is sent but this is what should be checked afterwards. If
 'nonewline' is set, we will cut off the trailing newline of this given data
 before comparing with the one actually received by the client
@@ -115,13 +124,15 @@ A list of features that MUST be present in the client/library for this test to
 be able to run (if these features are not present, the test will be
 SKIPPED). Features testable here are:
 
-SSL
-netrc_debug
-large_file
-idn
 getrlimit
+GnuTLS
+idn
 ipv6
+large_file
 libz
+netrc_debug
+OpenSSL
+SSL
 </features>
 
 <killserver>
@@ -154,7 +165,7 @@ Set the given environment variables to the specified value before the actual
 command is run, they are cleared again after the command has been run.
 </setenv>
 
-<command [option=no-output]>
+<command [option="no-output"]>
 command line to run, there's a bunch of %variables that get replaced
 accordingly.
 
@@ -172,13 +183,20 @@ argument that directs the output to a file. The --output is also not added if
 the client/stdout section is used.
 
 Available substitute variables include:
-%HOSTIP    - IP address of the host running this test
+%HOSTIP    - IPv6 address of the host running this test
 %HOSTPORT  - Port number of the HTTP server
+%HOST6IP   - IPv6 address of the host running this test
+%HOST6PORT - IPv6 port number of the HTTP server
 %HTTPSPORT - Port number of the HTTPS server
 %FTPPORT   - Port number of the FTP server
+%FTP6PORT  - IPv6 port number of the FTP server
 %FTPSPORT  - Port number of the FTPS server
+%FTP2PORT  - Port number of the FTP server 2
+%TFTPPORT  - Port number of the TFTP server
+%TFTP6PORT - IPv6 port number of the TFTP server
 %SRCDIR    - Full path to the source dir
 %PWD       - Current directory
+%CURL      - Path to the curl executable
 </command>
 
 <file name="log/filename">
@@ -200,28 +218,28 @@ example.
 </errorcode>
 <strip>
 One regex per line that is removed from the protocol dumps before the
-comparison is made. This is very useful to remove dependencies on dynamicly
+comparison is made. This is very useful to remove dependencies on dynamically
 changing protocol data such as port numbers or user-agent strings.
 </strip>
 <strippart>
 One perl op per line that operates on the protocol dump. This is pretty
 advanced. Example: "s/^EPRT .*/EPRT stripped/"
 </strippart>
-<protocol [nonewline=yes]>
+<protocol [nonewline="yes"]>
 the protocol dump curl should transmit, if 'nonewline' is set, we will cut
 off the trailing newline of this given data before comparing with the one
 actually sent by the client
 </protocol>
-<stdout [mode=text]>
-This verfies that this data was passed to stdout.
+<stdout [mode="text"]>
+This verifies that this data was passed to stdout.
 
-Use the "mode=text" attribute if the output is in text mode on platforms that
+Use the "mode="text"" attribute if the output is in text mode on platforms that
 have a text/binary difference.
 </stdout>
-<file name="log/filename" [mode=text]>
+<file name="log/filename" [mode="text"]>
 The file's contents must be identical to this after the test is complete.
 
-Use the "mode=text" attribute if the output is in text mode on platforms that
+Use the "mode="text" attribute if the output is in text mode on platforms that
 have a text/binary difference.
 </file>
 <stripfile>
@@ -235,3 +253,5 @@ the contents of the upload data curl should have sent
 disable - disables the valgrind log check for this test
 </valgrind>
 </verify>
+
+</testcase>

diff --git a/tests/data/test1 b/tests/data/test1
index 6f88024cffe433f2aaf43082ecef825d270d74d2..3c9a90ea75931eca37bbb36c305961b086625860 100644 (file)
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -51,3 +52,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test10 b/tests/data/test10
index f9fcbd717744d18138656ba02e7b0d39b70c3f13..25d5b6ffac2ebd7fbe04f0bca3da3c392df5d729 100644 (file)
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -63,3 +64,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test100 b/tests/data/test100
index 930c70ccdd8a49937854fda1a12c6087a04dbef8..1829b0500b66e260c8cc8db72725b5e6c0ada4c1 100644 (file)
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -55,3 +56,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test101 b/tests/data/test101
index 3109eef182f068fa439414446b334bcc5caedd88..74886af8cb2ad8a8f547d9329f7cc7776419da03 100644 (file)
--- a/tests/data/test101
+++ b/tests/data/test101
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -55,3 +56,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test102 b/tests/data/test102
index 57df47e1d3add18610f5dbf68ae0e85dbfd95c5e..99f0e3fc1e410ec306357cca8d19f88f78834d07 100644 (file)
--- a/tests/data/test102
+++ b/tests/data/test102
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -48,3 +49,4 @@ RETR 102
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test103 b/tests/data/test103
index 676cdf0e68df4a2ef43ba58eddcd434006bee925..0cc557b9819e6b5fc117232661ccbaba77eb02f2 100644 (file)
--- a/tests/data/test103
+++ b/tests/data/test103
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -50,3 +51,4 @@ RETR 103
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test104 b/tests/data/test104
index 03f9679717f8bdcb35d7a8379436459886154631..2806e75acc42011254b581488f5f09ff5638cea5 100644 (file)
--- a/tests/data/test104
+++ b/tests/data/test104
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -39,3 +40,4 @@ REST 0
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test105 b/tests/data/test105
index eb18e1ac312138d54b401b579312032325591719..d3a0a4f2d2c8272bfdc6b76fe955698f55f8600a 100644 (file)
--- a/tests/data/test105
+++ b/tests/data/test105
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -49,3 +50,4 @@ RETR 103
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test106 b/tests/data/test106
index deb623d22098bf4fe0497528bf98e2eb1ecc2009..fcf99d11ec0b2aaef1336d5076b8673997206082 100644 (file)
--- a/tests/data/test106
+++ b/tests/data/test106
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ RETR 106
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test107 b/tests/data/test107
index 8a487ba8e76637c46dfceb62cdae3303cac95b17..c5f611d3c553d034296bdaad754cd3961524f980 100644 (file)
--- a/tests/data/test107
+++ b/tests/data/test107
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ STOR 107
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test108 b/tests/data/test108
index eabe92e107a2497f218b186add717f33c3f391f8..535339236c6c5e51433ffd53af709aa014c38c1a 100644 (file)
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -52,3 +53,4 @@ Moooooooooooo
  upload this
 </upload>
 </verify>
+</testcase>

diff --git a/tests/data/test109 b/tests/data/test109
index f66fa92673865ceb1b1e02eeedfda25ab70d9a3d..88b139989ec38a5479bd9f53d747c679f13c0e79 100644 (file)
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ Moooooooooooo
  upload this
 </upload>
 </verify>
+</testcase>

diff --git a/tests/data/test11 b/tests/data/test11
index 84baa9076019503299e162e5c8b8eb503fe382ed..f86c834e2eaf7a031fbf02ef9f86124a6b9db219 100644 (file)
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -72,3 +73,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test110 b/tests/data/test110
index 6e7df1c68cea28966536a5fbc62221a1ff2a8df9..3a1dbc64a232d477d8bd054434c9526d94036ece 100644 (file)
--- a/tests/data/test110
+++ b/tests/data/test110
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -50,3 +51,4 @@ RETR 110
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test111 b/tests/data/test111
index 25e127438a560b820d194f170aaed3efde819942..f0479d83f68cc33f429d00f302d556cce5c8889d 100644 (file)
--- a/tests/data/test111
+++ b/tests/data/test111
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -43,3 +44,4 @@ SIZE 111
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test112 b/tests/data/test112
index 6ab189706f469864e1be40e4d81098ede7f4b5bf..0f743083da37291ecc331c1da5bb077b20b1f7d8 100644 (file)
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ QUIT
 worx?
 </upload>
 </verify>
+</testcase>

diff --git a/tests/data/test113 b/tests/data/test113
index c7b0e4f343339f4d23518dc3437d857fd205f48e..39d200e52b93406efe99e831094df7abd05adadd 100644 (file)
--- a/tests/data/test113
+++ b/tests/data/test113
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -33,3 +34,4 @@ REPLY USER 314 bluah you fewl!
 USER anonymous\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test114 b/tests/data/test114
index 0b7fa43250e2ab9357d208e8f59b378099000e1a..142dd734638e6142003d6ae8ba72a96c8c9f7fa7 100644 (file)
--- a/tests/data/test114
+++ b/tests/data/test114
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -34,3 +35,4 @@ USER anonymous
 PASS curl_by_daniel@haxx.se\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test115 b/tests/data/test115
index a3709ad55eedc7dda04f890aac5755b305898a28..d2d1f035fdfc2cb7878e3e2c1cc43adee751df47 100644 (file)
--- a/tests/data/test115
+++ b/tests/data/test115
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -40,3 +41,4 @@ PASV
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test116 b/tests/data/test116
index 6e517aea07535d59045186a09b9408410cc9d482..59a28f4421cd84414985142eaa00fd36dac055bf 100644 (file)
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -42,3 +43,4 @@ PWD
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test117 b/tests/data/test117
index eb31b33959a726b2d6e4f61de2942ed522948c65..90df955ecf75fdee7ed2f1034219457e9731a665 100644 (file)
--- a/tests/data/test117
+++ b/tests/data/test117
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -40,3 +41,4 @@ TYPE I
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test118 b/tests/data/test118
index 122cff23e40b196c4212697f4036427f959647b3..68e699115d8ff5cf901f920ab79ae84de66fd6f0 100644 (file)
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -44,3 +45,4 @@ RETR 118
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test119 b/tests/data/test119
index 4de6e44d43f42fc8f590cfed20308c550334ba9f..de6be4359617fa674daf3e04e1eb07dc8cb7353a 100644 (file)
--- a/tests/data/test119
+++ b/tests/data/test119
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ RETR 119
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test12 b/tests/data/test12
index e49676a209eb7050794ea8a2fb03a906f062c6c0..e7acd2dac21ed250012b05fe6bb6c91efe66b834 100644 (file)
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -51,3 +52,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test120 b/tests/data/test120
index c55f658cfeb5cc627224b9899c6504f1cc6b006e..bf1ab0bccc40b959acb81b147e3f77a71988b485 100644 (file)
--- a/tests/data/test120
+++ b/tests/data/test120
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -49,3 +50,4 @@ DELE file
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test121 b/tests/data/test121
index 7db404b6d7a5f02aa83c9c4cf7271c1ca0b85014..2bed51914deb056e7e0f441a618abdaf60369b07 100644 (file)
--- a/tests/data/test121
+++ b/tests/data/test121
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ DELE after_transfer
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test122 b/tests/data/test122
index 32e1a9ffbd4cd93e608ebda66026dbad1995611b..70c37454ad9a3ae0acba58e6a5db8ebbddac05bd 100644 (file)
--- a/tests/data/test122
+++ b/tests/data/test122
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -41,3 +42,4 @@ SIZE 122
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test123 b/tests/data/test123
index aa705eae93ff82abfc8a728e3cf55cedbf1f40dc..34f2aa000af545430f7e142512d3e037d913b749 100644 (file)
--- a/tests/data/test123
+++ b/tests/data/test123
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -36,3 +37,4 @@ TYPE I
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test124 b/tests/data/test124
index 03600dc9d83a069004bdb709d48a2edf38458313..d2da7750b338393a2e8c0b785628d29877b46fe5 100644 (file)
--- a/tests/data/test124
+++ b/tests/data/test124
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -43,3 +44,4 @@ RETR 124
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test125 b/tests/data/test125
index f5d69e4d1f5a96472cc6b95b21feea7c19d28d74..1559c9ea8df2ecbb21385f9172132fb1e76e5c93 100644 (file)
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -37,3 +38,4 @@ CWD path
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test126 b/tests/data/test126
index 9efe3d7b3e75af2e24957098dd6ac230832bf234..39a312cfba8d98dc73b4c3220851302c08a5f132 100644 (file)
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -44,3 +45,4 @@ RETR 126
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test127 b/tests/data/test127
index ec81e72be0bf2f1e9756e3057ab3c7134b2d63e7..773f9630f8cf79caa367fd87bf833be0ceea3555 100644 (file)
--- a/tests/data/test127
+++ b/tests/data/test127
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -42,3 +43,4 @@ RETR 127
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test128 b/tests/data/test128
index d2b58c9cb2ec19596aeee09746a37d829caada5a..aca500b3b6c9a97fb538404c8d81ed40f217c774 100644 (file)
--- a/tests/data/test128
+++ b/tests/data/test128
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -53,3 +54,4 @@ the
 --crlf option\r
 </upload>
 </verify>
+</testcase>

diff --git a/tests/data/test13 b/tests/data/test13
index 3af6ff9b9c4cf3a4544a1481cd02398a5011ff61..23f9cad804576d6828416cefef5978a12ff7f6ef 100644 (file)
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -40,3 +41,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test130 b/tests/data/test130
index 34406ec9bfff8841af96d05916ac02921bad0a01..c1e9cd998a3dd23a032a1e6a6796e21c7470196b 100644 (file)
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test131 b/tests/data/test131
index 14bdae3e33acc3a1750809c9b4df63d44b46e61c..d14bea47c13a0b08b81b7f305382bcd0e0ede5b0 100644 (file)
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -65,3 +66,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test132 b/tests/data/test132
index bf09ee72d6d903035416d53c34821bf86777da21..c03e8ed419a36f486b6017c349bfb60db721d902 100644 (file)
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test133 b/tests/data/test133
index f87229c34ba4135535be842c72c2260a3772a393..6016a64f1520b01ddb5cc96b54a8b278564132c9 100644 (file)
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test134 b/tests/data/test134
index ced21d7890d712ee7bbb0363d316b2141845707b..a18cbaa55fb1c61bdfde24aada17fafc5c89c1bc 100644 (file)
--- a/tests/data/test134
+++ b/tests/data/test134
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test135 b/tests/data/test135
index 0ac1c592115cdf89ca599ad03e6ce89759e24750..9a3d098d37dea6cb860f1535dcf9e594a5895203 100644 (file)
--- a/tests/data/test135
+++ b/tests/data/test135
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -14,7 +15,7 @@ Range
 0123456789abcdef
 0123456789abcdef
 </data>
-<datacheck nonewline=yes>
+<datacheck nonewline="yes">
 0123456789abc
 </datacheck>
 <size>
@@ -49,3 +50,4 @@ RETR 135
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test136 b/tests/data/test136
index ea8a651d33cb20e53bcc80c792dffd65b12a50b1..25940b50d8d9f476742a579e082aef0631172fa8 100644 (file)
--- a/tests/data/test136
+++ b/tests/data/test136
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -38,3 +39,4 @@ RETR 136
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test137 b/tests/data/test137
index d7475f843c6017f37a53e616546f0a43ec721bf7..816872fd2f0c83bb1b5a5b983fee5024711a39b1 100644 (file)
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -36,3 +37,4 @@ RETR 137
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test138 b/tests/data/test138
index 57577c2d7ca117eaf2e5b52e1794ab17ec5da809..46b7872130c8a4068bb78503de136c101972e6a1 100644 (file)
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -39,3 +40,4 @@ RETR 138
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test139 b/tests/data/test139
index 052d1f06befe750fa1cc8adb5869b35e77af646f..68cb8b25029a53f3c32fc975ae788b51db5cc208 100644 (file)
--- a/tests/data/test139
+++ b/tests/data/test139
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -36,3 +37,4 @@ RETR 139
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test14 b/tests/data/test14
index f10c6f488a9e5284c5b4d2d52bdbc9fc13cf5f05..926e89cf5da8f008bd1eec55de8d19764f7f94cc 100644 (file)
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -40,3 +41,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test140 b/tests/data/test140
index c030694ce4035faaed3bfe8733353ec071ab4fa6..a2be1ffa43fc938f8adbf853647b0a459c7a1565 100644 (file)
--- a/tests/data/test140
+++ b/tests/data/test140
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -31,3 +32,4 @@ MDTM 140
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test141 b/tests/data/test141
index 65be0474b11bb75ac81884ea211b814bb0e79265..f115b02ee62c7fce2693212aaedec2b0b1ceac44 100644 (file)
--- a/tests/data/test141
+++ b/tests/data/test141
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -37,3 +38,4 @@ QUIT
 Last-Modified: Wed, 09 Apr 2003 10:26:59 GMT\r
 </stdout>
 </verify>
+</testcase>

diff --git a/tests/data/test142 b/tests/data/test142
index 2061c9200a6f0bfc50d60a1ea0b26be3fed11597..eb8583ffae994c0ee08bdd6cc21fd87f287ba7b6 100644 (file)
--- a/tests/data/test142
+++ b/tests/data/test142
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -181,3 +182,4 @@ RETR 142
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test143 b/tests/data/test143
index 157bdd9eadaad9ee27ee101042ad718df02a36be..237ee27eae836243fa58516f4c626e64262c856c 100644 (file)
--- a/tests/data/test143
+++ b/tests/data/test143
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -33,3 +34,4 @@ RETR 143
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test144 b/tests/data/test144
index e47baf2096363a72dd9a44fe13e041d70f858585..3b03a7880e62e2769c0ea197278de7f05370c91b 100644 (file)
--- a/tests/data/test144
+++ b/tests/data/test144
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -38,3 +39,4 @@ NLST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test145 b/tests/data/test145
index b279bdaa419e12b40def5bc1325897a00eace389..b97bedf42a1ae0fb6b4cbcb32f623c6dbeb8a86b 100644 (file)
--- a/tests/data/test145
+++ b/tests/data/test145
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -41,3 +42,4 @@ NLST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test146 b/tests/data/test146
index 2d1940bc8fe34ac93d71ea2ebbb642820f5f8903..94ff997adc15e85fbe6bd749e8e5c838ad10005b 100644 (file)
--- a/tests/data/test146
+++ b/tests/data/test146
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -44,3 +45,4 @@ RETR 146
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test147 b/tests/data/test147
index b92c75106f2cd147fe034efa21383c5ffc77b59c..70bb762133083d17ba958b7ca01cf81af6ebcb0f 100644 (file)
--- a/tests/data/test147
+++ b/tests/data/test147
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -46,3 +47,4 @@ RETR 147
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test148 b/tests/data/test148
index 5e1f78a10cbe8ab45c3f8210cd4005bdb40688b1..e89cc82d33f4d25fb858e91a0db0994a942e18ac 100644 (file)
--- a/tests/data/test148
+++ b/tests/data/test148
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -39,3 +40,4 @@ MKD attempt
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test149 b/tests/data/test149
index 9195e19a973149f7d33649341136429584d63d83..5c21b3289dc097514989d0f974e3a8593ad39fd7 100644 (file)
--- a/tests/data/test149
+++ b/tests/data/test149
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -44,3 +45,4 @@ QUIT
 send away this contents
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test15 b/tests/data/test15
index e0a82826f8a729e92a2e902312bc5daf92a41b23..737ed419b85827f0e6427bced3b2a4f30fecb81e 100644 (file)
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -7,7 +8,7 @@ HTTP GET
 </info>
 # Server-side
 <reply>
-<data nocheck=true>
+<data nocheck="true">
 HTTP/1.4 200 OK\r
 Fake: yes\r
 Fake: yes\r
@@ -53,3 +54,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test150 b/tests/data/test150
index 46c556e9722645d25712425dc4adeef7e0df498a..fd2f5a1fa3179dfdee33e818c200d49ef1855bd1 100644 (file)
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -1,10 +1,13 @@
-# Server-side
+<testcase>
+
+<!-- Server-side -->
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
@@ -84,3 +87,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test151 b/tests/data/test151
index 82a0e108d8f9f47ed42e8e010a77bddd1e7a970e..b9430b83b99f31e8e8e92fd7fa338c0ae846555a 100644 (file)
--- a/tests/data/test151
+++ b/tests/data/test151
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -37,3 +38,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test152 b/tests/data/test152
index 12ba29c98c24183b65f440364eefb4e7f185fcfe..d2b77ff8c78d9057093cf885400900dfdfa6eac4 100644 (file)
--- a/tests/data/test152
+++ b/tests/data/test152
@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.0 401 BAD BOY
 Server: swsclose
 Content-Type: text/html
@@ -40,3 +41,4 @@ Accept: */*
 22
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test153 b/tests/data/test153
index 51137b38f96fd60e65cb98c32f4dac608f57eca0..aef165ef3d00ffb090544101d54ff6c147731fe0 100644 (file)
--- a/tests/data/test153
+++ b/tests/data/test153
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 # reply back and ask for Digest auth
@@ -118,3 +119,4 @@ Content-Length: 30
 This IS the second real page!
 </stdout>
 </verify>
+</testcase>

diff --git a/tests/data/test154 b/tests/data/test154
index e3d8770828746cdf1d9f0eeeb40f65d82a44e30a..5a79be38012b9411cc8f3518292a29301053b1c4 100644 (file)
--- a/tests/data/test154
+++ b/tests/data/test154
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <servercmd>
@@ -92,3 +93,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test155 b/tests/data/test155
index 0ddace228fa1bdf0d21cfe9827bcd6d3a0657797..50e6e9c76c80972930b3ec368311c81eb5583a03 100644 (file)
--- a/tests/data/test155
+++ b/tests/data/test155
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <servercmd>
@@ -123,3 +124,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test156 b/tests/data/test156
index 67deb08eedbde959b86b960612b8a30a6dcc46e8..bbc94262acbeae0e9824027c62d5cfcf46aa39bf 100644 (file)
--- a/tests/data/test156
+++ b/tests/data/test156
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -48,3 +49,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test157 b/tests/data/test157
index 67cf26c95b2773ad0fec5d3e6d81de360c049499..33708fc0a20bc12eb2bf01d34aba5677da219c9d 100644 (file)
--- a/tests/data/test157
+++ b/tests/data/test157
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -35,3 +36,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test158 b/tests/data/test158
index f3aaa7ebb5cb50009b5b5f722af47f1983e26922..7f9c6e744b060b1578cc26c3b7014a409ad287a0 100644 (file)
--- a/tests/data/test158
+++ b/tests/data/test158
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -46,3 +47,4 @@ daniel
 52
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test159 b/tests/data/test159
index 0bb4d89cc9be3401079e85807516cf88f3ecfdc9..245911de4cbc8e0ad0edca88c74d4540966e25ce 100644 (file)
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -1,10 +1,12 @@
+<testcase>
 # Server-side
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
@@ -84,3 +86,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test16 b/tests/data/test16
index 7d2a8b4061f9334d6121c35d63f7ddf88072aa77..142cecc8050b52e0413707f0065dc5a64e84a2aa 100644 (file)
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test160 b/tests/data/test160
index c831cce1f0e3d63b23178ef44af93068869c81af..b20df6dc99987476e1d156b41dc182a8bb1d663f 100644 (file)
--- a/tests/data/test160
+++ b/tests/data/test160
@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data nocheck=true>
+<data nocheck="true">
 HTTP/1.1 200 OK swsclose\r
 Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 9\r
@@ -62,3 +63,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test161 b/tests/data/test161
index cc2d3f1715922da1fdede683f5659d7f82bbf023..7a7fb8cbe6c6ba1f0de9ad635117d17a081ed07a 100644 (file)
--- a/tests/data/test161
+++ b/tests/data/test161
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -37,3 +38,4 @@ RETR 161
 18
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test162 b/tests/data/test162
index e0d602429bd6386c3d6d24bbb39c1914772a1906..b73c3bba61a20e3a7edbfd5c73d2a62ba123691c 100644 (file)
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data1001 nocheck=1>
+<data1001 nocheck="1">
 HTTP/1.0 407 BAD BOY
 Proxy-Authenticate: Basic realm="Squid proxy-caching web server"
 Server: swsclose
@@ -47,3 +48,4 @@ Proxy-Connection: Keep-Alive
 22
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test163 b/tests/data/test163
index b87504e440814f68459b69a98a5b556bd2369400..8659410c52cf7fcd0a318e0cf1d8bfd1fe462a4d 100644 (file)
--- a/tests/data/test163
+++ b/tests/data/test163
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -69,3 +70,4 @@ curl
 ------------------------------c2d1767eb6ac--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test164 b/tests/data/test164
index 3aa03c4819f1b7d3b0289c9ce2ef575791f7c030..958403eb1fe84538a552fc3f8ca94c48680101c2 100644 (file)
--- a/tests/data/test164
+++ b/tests/data/test164
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 # This particular response is an exact excerpt from an actual Apache
 # server when asked for a 0-10,12-15 range.
@@ -56,3 +57,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test165 b/tests/data/test165
index 20ef32d38d146d1a24aaf03cb1a08b7fae3d7746..812f1ef3a05d062c29d5b577f1751ff257c1e636 100644 (file)
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test166 b/tests/data/test166
index 0e915f9e02eb9e85315df3d9b1687b616464356a..274c0ce7bf96119a833fdadadae7e75dde7ac9d4 100644 (file)
--- a/tests/data/test166
+++ b/tests/data/test166
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -50,3 +51,4 @@ data inside the file
 ------------------------------b0b3d6d23991--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test167 b/tests/data/test167
index 6fa5b1bd34ca6dda664d01ef56287db8c08ec241..1667f3f8e3f5bea9180c791c184f94727eea8c3c 100644 (file)
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -64,3 +65,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test168 b/tests/data/test168
index 6f93ebab8097731114eb8b79854b821e9d9c03b8..d867099ae8f58b87919995f4ea18c289c3e35784 100644 (file)
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -85,3 +86,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test169 b/tests/data/test169
index 47139f81f6de746fefd5de85aaafe9d3b27e60ce..0308ef54c79dee4325c0af39b09cd8a05c665633 100644 (file)
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -112,3 +113,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test17 b/tests/data/test17
index 54c5910841e82367d9119aa489bc60c04c5c87b1..148b854644fa5e4c2aa1022ae69329f4121a776c 100644 (file)
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -50,3 +51,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test170 b/tests/data/test170
index 4b957a578b6059e61dc744844da35c9e3c5c3d65..ec9116a672b198efeb742033f8fc5e39c5157486 100644 (file)
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -39,3 +40,4 @@ Content-Length: 0
 52
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test171 b/tests/data/test171
index 2cd477f7008e29ea719ef3c6f97c349d5404d5d1..270c2fb38d3a204603b28b90f25efe91707151bf 100644 (file)
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -38,7 +39,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
-<file name="log/jar171" mode=text>
+<file name="log/jar171" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 .z.x.com       TRUE    /       FALSE   0       XToken  xt
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test172 b/tests/data/test172
index 3fec8300a4d8589c9e71fa1ec2cca19086c1e990..f4b617cd94fdac61891e8d86ab5df26aa9b51d5e 100644 (file)
--- a/tests/data/test172
+++ b/tests/data/test172
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -44,3 +45,4 @@ Cookie: nodomain=value; partmatch=present; tool=curl; name=fool
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test173 b/tests/data/test173
index 0050e5cccbe452b289d007037ff6aee599ab34a1..cbe47a3fce9dfdcd182be2a2c86b9a3ea9c8b5dc 100644 (file)
--- a/tests/data/test173
+++ b/tests/data/test173
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -69,3 +70,4 @@ line8
 ------------------------------5dbea401cd8c--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test174 b/tests/data/test174
index b14d39b1cee2f1c6dd4bee814484412fc44f5365..ea2771e37f2463568e3f2067ff555e57e8ef1af3 100644 (file)
--- a/tests/data/test174
+++ b/tests/data/test174
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -30,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /174 HTTP/1.1\r
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
 Host: 127.0.0.1:%HTTPPORT\r
@@ -41,3 +42,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test175 b/tests/data/test175
index db8f8a88a516d28f87470224c5160b759de533dd..c793a2e1b49cca13709b709526b6b1a23ecb6638 100644 (file)
--- a/tests/data/test175
+++ b/tests/data/test175
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -53,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /175 HTTP/1.1\r
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
 Host: 127.0.0.1:%HTTPPORT\r
@@ -71,3 +72,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test176 b/tests/data/test176
index f197367d70127ca38ed767f6cd9992fca8c4594c..ab5e2c347fe2ef0833455ef00b096765d12e2838 100644 (file)
--- a/tests/data/test176
+++ b/tests/data/test176
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 # the first request has NTLM type-1 included, and then the 1001 is returned
@@ -56,7 +57,7 @@ http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /176 HTTP/1.1\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
@@ -75,3 +76,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test177 b/tests/data/test177
index 989eeb146f6cf4d37c29b9ca7a19a9b40a0a01e0..79a4e51d58377df1c12ebdc8e9f874db45d67681 100644 (file)
--- a/tests/data/test177
+++ b/tests/data/test177
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -38,3 +39,4 @@ Content-Type: application/x-www-form-urlencoded
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test178 b/tests/data/test178
index efb56c0a4eb9353c0dcd6848168c35458358b912..f90fd7462cca70b56d1b67007d79e0b7a09b809a 100644 (file)
--- a/tests/data/test178
+++ b/tests/data/test178
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -39,3 +40,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test179 b/tests/data/test179
index 6d2249ee18c9f7abea1845aeb103965af1ac075b..a86f04e7e8e36f3bf873979e059bd3fa4f326f14 100644 (file)
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -45,3 +46,4 @@ Cookie: moo2=indeed
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test18 b/tests/data/test18
index d235ffa412910f8df4118ca3526033d9d1411c9a..0d3faeb4786c5e02c0db0d86b6c467b8367553ce 100644 (file)
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -7,7 +8,7 @@ HTTP GET
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 4\r
@@ -86,3 +87,4 @@ Content-Length: 4
 hoo
 </stdout>
 </verify>
+</testcase>

diff --git a/tests/data/test180 b/tests/data/test180
index d759397ca8459ea35e4450ac4a7b54b9ea70ef89..2d007d17ae1c7fb0c97922a440cb9f6f8aaf3a09 100644 (file)
--- a/tests/data/test180
+++ b/tests/data/test180
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <data>
 HTTP/1.0 200 OK swsclose
@@ -55,3 +56,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test181 b/tests/data/test181
index 6f2a375c2c20bf9ae1bafc9435a5a8b48f03fd38..aa145f0cb11a548122fccf5a43d435a0fdb7986c 100644 (file)
--- a/tests/data/test181
+++ b/tests/data/test181
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <data>
 HTTP/1.0 200 OK swsclose
@@ -56,3 +57,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test182 b/tests/data/test182
index 9d13a6a245d8b3d652d49010abacb45da0254a98..0db14b3b881a671dc4ad785c77636ddea14adb3d 100644 (file)
--- a/tests/data/test182
+++ b/tests/data/test182
@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data sendzero=yes>
+<data sendzero="yes">
 </data>
 <size>
 0
@@ -33,3 +34,4 @@ RETR 182
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test183 b/tests/data/test183
index f7e54fa3416d2633c08286be79d9d50a75b0d86f..cf20083f98dd99869c076a61d0a82bcf2fb266d6 100644 (file)
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -48,3 +49,4 @@ Proxy-Connection: Keep-Alive
 </protocol>
 
 </verify>
+</testcase>

diff --git a/tests/data/test184 b/tests/data/test184
index cd8de6315f809352e312e376d5e9a203fae7ce24..3f1403bb3ae6dfe961d1ae7d53fc8e2acf96f1a9 100644 (file)
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -67,3 +68,4 @@ Proxy-Connection: Keep-Alive
 </protocol>
 
 </verify>
+</testcase>

diff --git a/tests/data/test185 b/tests/data/test185
index 9799c61c700d0b8196950aa731f355c8a75856c2..3ba31f888f4cbe95d2c3ff81074ce4707879b9a3 100644 (file)
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -67,3 +68,4 @@ Host: another.visitor.stay.a.while.stay.foreeeeeever
 </protocol>
 
 </verify>
+</testcase>

diff --git a/tests/data/test186 b/tests/data/test186
index 763c6c805c7e880706fb5d38d84dfb6ea405ed05..682fd00f8e5030a3e3fb93f5d87b6bf46157b908 100644 (file)
--- a/tests/data/test186
+++ b/tests/data/test186
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -52,3 +53,4 @@ Content-Type: text/html
 ------------------------------212d9006ceb5--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test187 b/tests/data/test187
index 2919164f5d5cf5daff533e7ed0b8e2cb5edb9945..95a325fe5e26144072bfbda41b40ec72d4413dc5 100644 (file)
--- a/tests/data/test187
+++ b/tests/data/test187
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -65,3 +66,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test188 b/tests/data/test188
index f6eded22bda43e4a78ccef7005f6ecf75de2ac86..f831cc454941e89c6e4998c783249a6aab4fd61a 100644 (file)
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -64,3 +65,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test189 b/tests/data/test189
index 1885c57e404026f700c293680ee06c12af094689..7e49e1eea67bcbda447d078d7377e6559f975703 100644 (file)
--- a/tests/data/test189
+++ b/tests/data/test189
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -65,3 +66,4 @@ Accept: */*
 33
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test19 b/tests/data/test19
index 9a40db2edd542deda29998e064b0abc77541f6b8..aba75d3ec0a5e58437ec5c979a850718788916c8 100644 (file)
--- a/tests/data/test19
+++ b/tests/data/test19
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -30,3 +31,4 @@ attempt connect to non-listening socket
 7
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test190 b/tests/data/test190
index ab241a760b0b16bfa767fa4c831541395cdbb2d0..b5c17850ec1c502a8f34938087c1224d76a6a618 100644 (file)
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 moooooooo
@@ -35,3 +36,4 @@ PWD
 CWD path\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test191 b/tests/data/test191
index 91bc24526f58a9921dc91a196f14cb9beef024f0..090d4c5b690a8c083110a0c213892287ff60a267 100644 (file)
--- a/tests/data/test191
+++ b/tests/data/test191
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -31,3 +32,4 @@ RETR 191
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test192 b/tests/data/test192
index e29cdcbc758cd63d10e219e3aac3d3b84e178fd6..21e15d1a48bb679f66a2d5a11cf88406ad5851c3 100644 (file)
--- a/tests/data/test192
+++ b/tests/data/test192
@@ -1,7 +1,8 @@
+<testcase>
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
@@ -48,3 +49,4 @@ monster
 1
 </stdout>
 </verify>
+</testcase>

diff --git a/tests/data/test193 b/tests/data/test193
index 7c53de6c8809b50a1efb2d4b1e69ac5aaa9996d0..7e0c0b1cd5924327f2badb8ebe83feec18dd8e2d 100644 (file)
--- a/tests/data/test193
+++ b/tests/data/test193
@@ -1,7 +1,8 @@
+<testcase>
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 302 OK swsbounce swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
@@ -10,7 +11,7 @@ Location: ./193
 
 monster
 </data>
-<data1 nocheck=1>
+<data1 nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
@@ -69,3 +70,4 @@ monster
 </stdout>
 
 </verify>
+</testcase>

diff --git a/tests/data/test194 b/tests/data/test194
index 9842551ce3ccbd3556855addbc8d348e5c209240..38a5485d768d7b59bd06486d2d52286454558e63 100644 (file)
--- a/tests/data/test194
+++ b/tests/data/test194
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -43,3 +44,4 @@ Accept: */*
 </protocol>
 
 </verify>
+</testcase>

diff --git a/tests/data/test195 b/tests/data/test195
index cadfb3d6f873a55e54a49ab87004df22c8f7748b..f986bfb6e6044d376db420b942be5f93c628d323 100644 (file)
--- a/tests/data/test195
+++ b/tests/data/test195
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -28,3 +29,4 @@ USER anonymous
 PASS curl_by_daniel@haxx.se\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test196 b/tests/data/test196
index b47cf5d6bdcdfee95db5afa22f9d35516fedbccb..6bc3dbd8606b9742be7fc4dc9b8a816c46f21a7c 100644 (file)
--- a/tests/data/test196
+++ b/tests/data/test196
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -31,3 +32,4 @@ USER anonymous
 PASS curl_by_daniel@haxx.se\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test197 b/tests/data/test197
index 59ee26029439a52486b15305e71e8d799a31eed4..8295b676b1a83ca3541f8fe117fee7308e5015b3 100644 (file)
--- a/tests/data/test197
+++ b/tests/data/test197
@@ -1,14 +1,15 @@
+<testcase>
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 503 OK swsbounce
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 21
 
 server not available
 </data>
-<data1 nocheck=1>
+<data1 nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 3
@@ -65,3 +66,4 @@ ok
 </stdout>
 
 </verify>
+</testcase>

diff --git a/tests/data/test198 b/tests/data/test198
index 51d0e6f020c38dac6151465ace3801b747b0785f..45438e5423f3be31f017cb157bd5d471536eaa11 100644 (file)
--- a/tests/data/test198
+++ b/tests/data/test198
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -60,3 +61,4 @@ Accept: */*
 </protocol>
 
 </verify>
+</testcase>

diff --git a/tests/data/test199 b/tests/data/test199
index 2b2b435df1b860e8385e93f5f7eff624bb628744..db0d12c923fffb4734899cba3b3e8a16b47e62da 100644 (file)
--- a/tests/data/test199
+++ b/tests/data/test199
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply name="1">
@@ -13,7 +14,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -48,3 +49,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test2 b/tests/data/test2
index c701e79ba045738d39e55de831ffef7c49625355..573bdfcdc128e8519dd5d0dbbe7206ba01c0a72c 100644 (file)
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -49,3 +50,4 @@ Accept: */*
 [insert full protocol verifiction dump here]
 </data>
 </verify>
+</testcase>

diff --git a/tests/data/test20 b/tests/data/test20
index abc839892a9f0955d304c953ab8efea0c389be78..cd1536060bd08ddd1ab93f0304da8a3aea5d1277 100644 (file)
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 non-existing host name
@@ -29,3 +30,4 @@ non-existing-and-weeeeeeirdname.
 6
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test200 b/tests/data/test200
index bd9a448aef709d3d405c9c026cce92c2b5128f80..7b5ec41ffd4e9e43e17ea152599692d5949c3307 100644 (file)
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -32,3 +33,4 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 </verify>
+</testcase>

diff --git a/tests/data/test201 b/tests/data/test201
index a2915923e7b7e1173b0db90a902349a25c3d4c93..e8ddb7fae8ef468d704046cf9add7d64330668bf 100644 (file)
--- a/tests/data/test201
+++ b/tests/data/test201
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -23,3 +24,4 @@ file://localhost/%PWD/log/non-existant-file.txt
 37
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test202 b/tests/data/test202
index 937e0beb924b20f98e8aa97cdaebddeb6cf60ab8..5b578cbab61045e72bf414153343fa6f19ee0f82 100644 (file)
--- a/tests/data/test202
+++ b/tests/data/test202
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -27,3 +28,4 @@ contents in a single file
 contents in a single file
 </stdout>
 </verify>
+</testcase>

diff --git a/tests/data/test203 b/tests/data/test203
index 2cec4a69d5f43a573f2f911474161196b1f1f701..c1c04209b7b86c072a08f7e5c424d637ccfca249 100644 (file)
--- a/tests/data/test203
+++ b/tests/data/test203
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -32,3 +33,4 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 </verify>
+</testcase>

diff --git a/tests/data/test204 b/tests/data/test204
index cd661d3f37b87a446e8d83248c748d6586c03e74..cb21c6d38363010ec7629a9b144f87b33f9208f5 100644 (file)
--- a/tests/data/test204
+++ b/tests/data/test204
@@ -1,3 +1,4 @@
+<testcase>
 # no Server-side
 
 # Client-side
@@ -30,3 +31,4 @@ to
 write
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test205 b/tests/data/test205
index b82919053562381cbdecb28d59bbd746985dc04e..7bef1a8687b331a2393c48dc62face9560426502 100644 (file)
--- a/tests/data/test205
+++ b/tests/data/test205
@@ -1,3 +1,4 @@
+<testcase>
 # no Server-side
 
 # Client-side
@@ -27,3 +28,4 @@ write
 23
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test206 b/tests/data/test206
index b60393dfea7ac1ba2d6c396e8378c7bf0aab9ea9..a2b7034b7405515c30ed1e05c8617a7577ae2fb9 100644 (file)
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -82,3 +83,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test207 b/tests/data/test207
index 48d556d7e20dc2331d4e74060717a314bf73607b..e3ac65c999077add8068c1b443ff12e0f3d02299 100644 (file)
--- a/tests/data/test207
+++ b/tests/data/test207
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -54,3 +55,4 @@ Accept: */*
 18
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test208 b/tests/data/test208
index d57b79fd8524ee80f2b995422403afd95eb28fb6..97eacbc458bb9c7ed81f9ca800e31f008b1c613a 100644 (file)
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -60,3 +61,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test209 b/tests/data/test209
index 4ebf7409f1ad04ac1e6555443bb7aa8bd047cc4a..e7f1d34d2d02136bc6e2b4918b4db53b3a8ed014 100644 (file)
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -101,3 +102,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test21 b/tests/data/test21
index 5f0338cac39b7015c73fa4e7e0248827d0089c8e..8e4e847e09f7ec2aa2bccf51058ddee33043a7ee 100644 (file)
--- a/tests/data/test21
+++ b/tests/data/test21
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FAILURE
@@ -29,3 +30,4 @@ use curl with multiple request methods
 2
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test210 b/tests/data/test210
index 711a26ad1edb6cecd952493d84ce44869e73824a..dd8c5c782e8b2515cce802e9a9391c389238ae86 100644 (file)
--- a/tests/data/test210
+++ b/tests/data/test210
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -42,3 +43,4 @@ RETR 210
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test211 b/tests/data/test211
index 18f4cb11e98c094350db08412b18d77ce223a86b..46c538aeb4422e62f6cf40d2c3916c62fdd60741 100644 (file)
--- a/tests/data/test211
+++ b/tests/data/test211
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -44,3 +45,4 @@ RETR 211
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test212 b/tests/data/test212
index c34ffe02254c6a832695a0c9b4fb2705daffcf37..943ae7a09b435dfcdb04d26012bea49d813e7da8 100644 (file)
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -51,3 +52,4 @@ RETR 212
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test213 b/tests/data/test213
index 364791cef0a88b17607b2dede3787f5af8ea0504..1e2464d5efb0d8ed63e9ea5fb7c4b1e649bb3513 100644 (file)
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -83,7 +84,7 @@ http://test.remote.server.com:213/path/2130002 --proxy http://%HOSTIP:%HTTPPORT
 <strippart>
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 CONNECT test.remote.server.com:213 HTTP/1.0\r
 Host: test.remote.server.com:213\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
@@ -104,3 +105,4 @@ Content-Type: application/x-www-form-urlencoded
 postit
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test214 b/tests/data/test214
index f79f48520345e106b24a212900bdd74d318049d2..7d93ab23421460b1aead2408cff8eafe46a620b5 100644 (file)
--- a/tests/data/test214
+++ b/tests/data/test214
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -8,7 +9,7 @@ Content-Length: 6
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -40,3 +41,4 @@ Accept: */*
 </protocol>
 
 </verify>
+</testcase>

diff --git a/tests/data/test215 b/tests/data/test215
index 6077feb8baf45f915633572fa43fb30feea158d2..d44b2f36775446496a32702d1e4dc8118e2f3ba1 100644 (file)
--- a/tests/data/test215
+++ b/tests/data/test215
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 # When doing LIST, we get the default list output hard-coded in the test
@@ -48,3 +49,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test216 b/tests/data/test216
index ba3d527206827c713a318cb059aaf13e33405699..2ed0925f33e1e2908b8925079aedf330ab1e1296 100644 (file)
--- a/tests/data/test216
+++ b/tests/data/test216
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -35,3 +36,4 @@ STOR ..anotherup
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test217 b/tests/data/test217
index c74ac9cb5e56542d3d85482e01fc361f44d9e4c6..da98339ee9885efb1fc5044e924c7c381afeb937 100644 (file)
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -1,8 +1,9 @@
+<testcase>
 # Server-side
 <reply>
 
 # this is returned first since we get no proxy-auth
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 405 Method Not Allowed swsclose\r
 \r
 And you should ignore this data.
@@ -44,3 +45,4 @@ HTTP/1.1 405 Method Not Allowed swsclose
 000 405
 </stdout>
 </verify>
+</testcase>

diff --git a/tests/data/test218 b/tests/data/test218
index bcf5d7a472d413e95c3cc3f7cc1f0d136d9ae388..4b1248381ab5e5f3c03f7fbe3d97c213a6915a28 100644 (file)
--- a/tests/data/test218
+++ b/tests/data/test218
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -48,3 +49,4 @@ just some tiny teeny contents
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test22 b/tests/data/test22
index 0623d99bd26dc1595d9ae0e485d1e3a9164ec027..075cf2882215b839a395eb0d61f73233efb489f2 100644 (file)
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -42,3 +43,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test220 b/tests/data/test220
index 2fa2d9f489c917738d7d53d043494ead67d4fd7e..b41b91f38315d5f7814cbc7a01e9b24317568789 100644 (file)
--- a/tests/data/test220
+++ b/tests/data/test220
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ compressed
 #
 # Server-side
 <reply>
-<data base64=yes>
+<data base64="yes">
 SFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDI5IE5vdiAyMDA0IDIxOjU2OjUzIEdNVA0KU2Vy
 dmVyOiBBcGFjaGUvMS4zLjMxIChEZWJpYW4gR05VL0xpbnV4KSBtb2RfZ3ppcC8xLjMuMjYuMWEg
 UEhQLzQuMy45LTEgbW9kX3NzbC8yLjguMjAgT3BlblNTTC8wLjkuN2QgbW9kX3BlcmwvMS4yOQ0K
@@ -64,3 +65,4 @@ Accept-Encoding: deflate, gzip
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test221 b/tests/data/test221
index 211ca1e0c5355e38d3ca41a4f1f6e39992bcf7c6..6ba88ee7b4cd9fe1064e8ddc0b39dc8a8e7a00c6 100644 (file)
--- a/tests/data/test221
+++ b/tests/data/test221
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -9,7 +10,7 @@ FAILURE
 #
 # Server-side
 <reply>
-<data base64=yes>
+<data base64="yes">
 SFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDI5IE5vdiAyMDA0IDIxOjU2OjUzIEdNVA0KU2Vy
 dmVyOiBBcGFjaGUvMS4zLjMxIChEZWJpYW4gR05VL0xpbnV4KSBtb2RfZ3ppcC8xLjMuMjYuMWEg
 UEhQLzQuMy45LTEgbW9kX3NzbC8yLjguMjAgT3BlblNTTC8wLjkuN2QgbW9kX3BlcmwvMS4yOQ0K
@@ -67,3 +68,4 @@ Accept-Encoding: deflate, gzip
 61
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test222 b/tests/data/test222
index 4c089dd52be1077b7530134bba7c67a318618733..fc77837d2f85d3ffc5d95fff99b7ee8f1be106a0 100644 (file)
--- a/tests/data/test222
+++ b/tests/data/test222
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ compressed
 #
 # Server-side
 <reply>
-<data base64=yes>
+<data base64="yes">
 SFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDI5IE5vdiAyMDA0IDIxOjU2OjUzIEdNVA0KU2Vy
 dmVyOiBBcGFjaGUvMS4zLjMxIChEZWJpYW4gR05VL0xpbnV4KSBtb2RfZ3ppcC8xLjMuMjYuMWEg
 UEhQLzQuMy45LTEgbW9kX3NzbC8yLjguMjAgT3BlblNTTC8wLjkuN2QgbW9kX3BlcmwvMS4yOQ0K
@@ -195,3 +196,4 @@ Accept-Encoding: deflate, gzip
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test223 b/tests/data/test223
index df367f715a843929ef4c3ee4ecfed2293624f341..bed5d1882b6f36d12eb223b547089a393d72b373 100644 (file)
--- a/tests/data/test223
+++ b/tests/data/test223
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -10,7 +11,7 @@ FAILURE
 # Server-side
 <reply>
 # this deflate chunk has three bytes removed from the beginning
-<data base64=yes>
+<data base64="yes">
 SFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDI5IE5vdiAyMDA0IDIxOjU2OjUzIEdNVA0KU2Vy
 dmVyOiBBcGFjaGUvMS4zLjMxIChEZWJpYW4gR05VL0xpbnV4KSBtb2RfZ3ppcC8xLjMuMjYuMWEg
 UEhQLzQuMy45LTEgbW9kX3NzbC8yLjguMjAgT3BlblNTTC8wLjkuN2QgbW9kX3BlcmwvMS4yOQ0K
@@ -88,3 +89,4 @@ Accept-Encoding: deflate, gzip
 61
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test224 b/tests/data/test224
index 84cedd65aac65d0fb69f937676fece681c7f5dda..dc713651bb5dd83ff2a98bf4fee57ef47ad68123 100644 (file)
--- a/tests/data/test224
+++ b/tests/data/test224
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ compressed
 #
 # Server-side
 <reply>
-<data base64=yes>
+<data base64="yes">
 SFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDI5IE5vdiAyMDA0IDIxOjU2OjUzIEdNVA0KU2Vy
 dmVyOiBBcGFjaGUvMS4zLjMxIChEZWJpYW4gR05VL0xpbnV4KSBtb2RfZ3ppcC8xLjMuMjYuMWEg
 UEhQLzQuMy45LTEgbW9kX3NzbC8yLjguMjAgT3BlblNTTC8wLjkuN2QgbW9kX3BlcmwvMS4yOQ0K
@@ -100,3 +101,4 @@ Accept-Encoding: deflate, gzip
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test225 b/tests/data/test225
index 9dee84255498465636431a45b89736cc082b21f9..fe39db9ece3dcbb7c4f25090239f0673a019b640 100644 (file)
--- a/tests/data/test225
+++ b/tests/data/test225
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -25,3 +26,4 @@ ftp://bad%0auser:passwd@%HOSTIP:%FTPPORT/225%0a
 3
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test226 b/tests/data/test226
index e0ccf5b933543e7c70ff663087ba96c1ac38b1f0..727e1534cabbe2f07a48baf1967af673b19bcdbe 100644 (file)
--- a/tests/data/test226
+++ b/tests/data/test226
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -25,3 +26,4 @@ ftp://%HOSTIP:%FTPPORT/226%0d
 3
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test227 b/tests/data/test227
index b5e0d9379b1f97bb361ad4ea57113a57eeeeb303..7ce25a60b51bdaaf2407892ea27796e5dfebf536 100644 (file)
--- a/tests/data/test227
+++ b/tests/data/test227
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -52,3 +53,4 @@ NOOP 3
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test228 b/tests/data/test228
index d1c5daf87a7294dd657dbcbec23753105f3b98e5..714f7cae6ccc3d69e7b34351dbd1b7138c718150 100644 (file)
--- a/tests/data/test228
+++ b/tests/data/test228
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -49,3 +50,4 @@ RETR 228
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test229 b/tests/data/test229
index 92c83fb81ea3a0560c10250ee79737be1d3e064c..8b6af9602a6d48b65974efa925489dcea001db3d 100644 (file)
--- a/tests/data/test229
+++ b/tests/data/test229
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -38,3 +39,4 @@ ACCT one count
 11
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test23 b/tests/data/test23
index 4155ea2cdcba98c98df316c2871432a6fc7bc56c..46872e82ea6b71b19ad5cacf176a17421f78530a 100644 (file)
--- a/tests/data/test23
+++ b/tests/data/test23
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 unsupported protocol
@@ -29,3 +30,4 @@ htfp://%HOSTIP:%HTTPPORT/none.htfml
 1
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test233 b/tests/data/test233
index b11aabbbd29bd6fdc487aa57c33efe77a86eeeb1..6832ae5dd9e2c97096e642642a6fb80231227bc3 100644 (file)
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -92,3 +93,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test234 b/tests/data/test234
index c8775c543809900adb1056f4bafa393e2a706ce3..47cd0270ebf219b5a8eccd238d5f9f825186593e 100644 (file)
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -84,3 +85,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test235 b/tests/data/test235
index c1345b9c2864abe277c84438e59d34790de450e3..699a478f9bca2e7aaac606bd797fc576eb324524 100644 (file)
--- a/tests/data/test235
+++ b/tests/data/test235
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -40,3 +41,4 @@ this is the *****crap******** that we're gonna upload
 worx?
 </upload>
 </verify>
+</testcase>

diff --git a/tests/data/test236 b/tests/data/test236
index 29d739f922cf3bfc5ecfa66fdd3bfff52c0f1157..b25e898f83cf7800d12b7cbaf13f80a915b79eb5 100644 (file)
--- a/tests/data/test236
+++ b/tests/data/test236
@@ -1,3 +1,4 @@
+<testcase>
 # Client-side
 <client>
 <server>
@@ -35,3 +36,4 @@ QUIT
 25
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test237 b/tests/data/test237
index c276da91725633ebc7cc75bb19eac2d17bc519b1..a1e105af7858c43d421b5e04e95e9405f769a382 100644 (file)
--- a/tests/data/test237
+++ b/tests/data/test237
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -38,3 +39,4 @@ PWD
 PASV\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test238 b/tests/data/test238
index 8e23b4fb064d39d4a7ae403a7be18d13441f7966..97050157f43a1f85905acbc236dc5d3221044d0d 100644 (file)
--- a/tests/data/test238
+++ b/tests/data/test238
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -37,3 +38,4 @@ EPSV
 PASV\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test239 b/tests/data/test239
index 6fd4f09333ae69b065a4983c56f19321595d3bc5..0f6bb249aee979c570d62b4dc2d84a5ea291c5d0 100644 (file)
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -61,7 +62,7 @@ http://%HOSTIP:%HTTPPORT/239 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly
 <strippart>
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
@@ -85,3 +86,4 @@ Content-Type: application/x-www-form-urlencoded
 postit
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test24 b/tests/data/test24
index be12be5d0a33366b3efc12f96abe99ddef099b04..e650b311ebd33c106335a387a3822ad9402075ca 100644 (file)
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -6,7 +7,7 @@ HTTP GET
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.0 404 BAD BOY
 Content-Type: text/html
 
@@ -43,3 +44,4 @@ Accept: */*
 22
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test240 b/tests/data/test240
index 77029d44c75aa44d68786b571f4c9e45c13b91d1..cd8594d63f46c7f27e6ae0cf7baf91fc7083bd12 100644 (file)
--- a/tests/data/test240
+++ b/tests/data/test240
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -54,3 +55,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test241 b/tests/data/test241
index 29143dc7a9fcdf30e6677e189c5515f2ba72f065..46eae1f7248b55fc293021a8d58c211248e3bde2 100644 (file)
--- a/tests/data/test241
+++ b/tests/data/test241
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -52,3 +53,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test242 b/tests/data/test242
index 275b0221b1ade7be6fa6725ff7d286e4512c3382..639b2c093ad8e680f6b639d8bd8832658120bfcc 100644 (file)
--- a/tests/data/test242
+++ b/tests/data/test242
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -50,3 +51,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test243 b/tests/data/test243
index c020896facb220f4689b2726cdbfcc066858b678..fcb10885c950430716e75178affa121a5a2e41ff 100644 (file)
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -89,7 +90,7 @@ http://%HOSTIP:%HTTPPORT/243 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly
 <strippart>
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST http://127.0.0.1:8990/243 HTTP/1.1\r
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Host: 127.0.0.1:8990\r
@@ -122,3 +123,4 @@ Content-Type: application/x-www-form-urlencoded
 postit
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test245 b/tests/data/test245
index c4de97b8349d7d1f7169070167a04e5d8e3a670b..ffefb219bce45ea73817a040fe67266e458f9e2f 100644 (file)
--- a/tests/data/test245
+++ b/tests/data/test245
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -53,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/245 -u auser:apasswd --digest -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /245 HTTP/1.1\r
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
 Host: 127.0.0.1:%HTTPPORT\r
@@ -72,3 +73,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test246 b/tests/data/test246
index 540f1d79448fc0761dfd1685c0a9bf0916875a15..72e27b998f1e9dfa786354fed91605d0ce57b6a6 100644 (file)
--- a/tests/data/test246
+++ b/tests/data/test246
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -63,7 +64,7 @@ http://%HOSTIP:%HTTPPORT/246 -u auser:apasswd --digest -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /246 HTTP/1.1\r
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
 Host: 127.0.0.1:%HTTPPORT\r
@@ -82,3 +83,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test247 b/tests/data/test247
index 0985b8682b88c6dbeeab8dd4dd7816d8d77aa7b8..3ed809d2e95cda72eb5300d167750497124fe099 100644 (file)
--- a/tests/data/test247
+++ b/tests/data/test247
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <mdtm>
 213 20030409102659
@@ -37,3 +38,4 @@ MDTM 247
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test248 b/tests/data/test248
index 3fc3fc14b65b143b5097a4fd3b32896736870a77..b2c3c4a36dc9be0928609fc63f02a2509083504b 100644 (file)
--- a/tests/data/test248
+++ b/tests/data/test248
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <mdtm>
 213 20050409102659
@@ -46,3 +47,4 @@ STOR 248
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test249 b/tests/data/test249
index f196e23ee2e74d7eefc585e8b2cffd6b379edc05..190732569ef5c589d841eaaa3a5d0a8633dd91a1 100644 (file)
--- a/tests/data/test249
+++ b/tests/data/test249
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -43,3 +44,4 @@ If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test25 b/tests/data/test25
index b0c6cd5d82ff3211ff5dacbba0aff916d5ef6673..9c3a991787e66e00b9efe37258d7df71e86142a3 100644 (file)
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -112,3 +113,4 @@ Accept: */*
 47
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test250 b/tests/data/test250
index b3fa1cfdc8518aa93324ac7a04f0d13cfc06faba..fc5ce0b0252461032d5b33e035db48040f2b5479 100644 (file)
--- a/tests/data/test250
+++ b/tests/data/test250
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -51,3 +52,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test251 b/tests/data/test251
index 6b3cf7b219079676a53e8d7860e4354b5c89b8be..1afc12b350e0a70556da806c95c2ea90b9a7c1c0 100644 (file)
--- a/tests/data/test251
+++ b/tests/data/test251
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 # When doing LIST, we get the default list output hard-coded in the test
@@ -51,3 +52,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test252 b/tests/data/test252
index 0cb6544b8b06b902a503ed0768e55538144f2261..37769d92bd7959cd1f007e735aef88bc0ae15ce8 100644 (file)
--- a/tests/data/test252
+++ b/tests/data/test252
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP-ipv6
@@ -57,3 +58,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test253 b/tests/data/test253
index c4419a4a6d78ee4d7d8bafdd597e4908941aee7d..a1620dd73d1162c138a530550537a86385e82508 100644 (file)
--- a/tests/data/test253
+++ b/tests/data/test253
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP-ipv6
@@ -57,3 +58,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test254 b/tests/data/test254
index ddabed8a2be33fe5f19e12cfb0aec0870d752971..416064731dca1741afc1447cda931b69eeaf09e0 100644 (file)
--- a/tests/data/test254
+++ b/tests/data/test254
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP-ipv6
@@ -58,3 +59,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test255 b/tests/data/test255
index 893256e9c224c909e8e900ff3142303439e8bfb6..d26e82a7e3f7b23d197ef76d36e71fbd80e9a911 100644 (file)
--- a/tests/data/test255
+++ b/tests/data/test255
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP-ipv6
@@ -58,3 +59,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test256 b/tests/data/test256
index 38a38ba08bdf5332183985b17f5abeb33a6f2f87..3bee0dbdeef5e446607f992fb2e6f2a724e42d8e 100644 (file)
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -9,7 +10,7 @@ FAILURE
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.0 200 Mooo
 Date: Mon, 13 Nov 2000 13:41:09 GMT
 Server: myown/1.0
@@ -61,3 +62,4 @@ This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test257 b/tests/data/test257
index 90680f39513c8c24e2021328c001f27020a92d4f..1020c613ec41125892a0aeb7780421951531e9c2 100644 (file)
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -111,3 +112,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test258 b/tests/data/test258
index 947f0e0cdad8ddc123955cf0dbbf05c4cc3e79d2..1a839d8a2a01cf2f4cc11ddd131bcd700467ad0c 100644 (file)
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -127,3 +128,4 @@ bar
 ------------------------------7c633d5c27ce--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test259 b/tests/data/test259
index 84017407dd148038aa1d7df9fc6eb99e7fc12dff..9d8627245287453ed5f67fe5fa575ed53b01608a 100644 (file)
--- a/tests/data/test259
+++ b/tests/data/test259
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -126,3 +127,4 @@ bar
 ------------------------------7c633d5c27ce--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test26 b/tests/data/test26
index f92cf2326dd6ec6eb594644fe4203968d65a6eac..a7505b5b1bc6341a90e19a13a16c403077a763c4 100644 (file)
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -41,3 +42,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test260 b/tests/data/test260
index 930786435db0b8da7edd5e11203630c83ffe4150..5555366ffec271360be4ac34ca71a64b7063fdad 100644 (file)
--- a/tests/data/test260
+++ b/tests/data/test260
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -51,3 +52,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test261 b/tests/data/test261
index 419bf9b2698331ac09b251dc35d2905255240fa7..79af663fde7e5157d93e9e851a5cb236c65bb95e 100644 (file)
--- a/tests/data/test261
+++ b/tests/data/test261
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ RETR 261
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test262 b/tests/data/test262
index b9b5a61f456170048c5f49207a75e0bdd050dd77..0178a13040b8e27614fa9c0d36a4943debd2b120 100644 (file)
Binary files a/tests/data/test262 and b/tests/data/test262 differ

diff --git a/tests/data/test263 b/tests/data/test263
index 837f2470ea01195b4c5a5465c8e7bed3cd46256a..b0858516625fc49cfb93393863a5236335a7a111 100644 (file)
--- a/tests/data/test263
+++ b/tests/data/test263
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -51,3 +52,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test264 b/tests/data/test264
index 55f79b6d23c549e8e1b66a398e38a50bb0b407ba..9648f05f88e75184f5420c42d4ec12ad6c525176 100644 (file)
--- a/tests/data/test264
+++ b/tests/data/test264
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test265 b/tests/data/test265
index 5b44b6ff2f123d70bd951db0973df1273236a785..649aa04b49b8ee09fa1ae7d8f78c1fb6b99d47ee 100644 (file)
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -86,7 +87,7 @@ http://test.remote.server.com:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT
 <strippart>
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 CONNECT test.remote.server.com:265 HTTP/1.0\r
 Host: test.remote.server.com:265\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
@@ -107,3 +108,4 @@ Content-Type: application/x-www-form-urlencoded
 postit
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test266 b/tests/data/test266
index f3c6132935a4597e0eaf557bce0a3aa9c13c7cae..e82b215a8990baa2b6202f60824671af299fdadf 100644 (file)
--- a/tests/data/test266
+++ b/tests/data/test266
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -74,3 +75,4 @@ chunky-trailer: header data
 </file>
 </verify>
 
+</testcase>

diff --git a/tests/data/test267 b/tests/data/test267
index dc7f8dc232e8cd952bebd58d3ab3f924f7203e92..78676dfbc1d4e7a020dda43c3aafb76c0a4a0c90 100644 (file)
--- a/tests/data/test267
+++ b/tests/data/test267
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,10 +9,11 @@ HTTP NTLM auth
 # Server-side
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
@@ -76,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/267 -u testuser:testpass --ntlm -d "data" -H "Header1:
 <strippart>
 s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA).*/$1/
 </strippart>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /267 HTTP/1.1\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
@@ -100,3 +102,4 @@ Content-Type: application/x-www-form-urlencoded
 data
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test268 b/tests/data/test268
index 4b8b6b9d219ba36798f0a617599f17a910596376..e68479377463d713d99d045795de0d96af911562 100644 (file)
--- a/tests/data/test268
+++ b/tests/data/test268
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -53,3 +54,4 @@ Content-Type: application/x-www-form-urlencoded
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test269 b/tests/data/test269
index 1fbf90a3cc35ec3c70b6e5c6e006d7a5cb5ddafe..aa3b8e5de1c21d82f89bec7bd69e6b9aca24dd2c 100644 (file)
--- a/tests/data/test269
+++ b/tests/data/test269
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -49,3 +50,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test27 b/tests/data/test27
index 85b087aab7c84ff467909948881651de183e3a7e..980b07ac61cf69d95ae3330816fe9ac5b91220eb 100644 (file)
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -52,3 +53,4 @@ Cookie: thewinneris=nowayyouwin
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test270 b/tests/data/test270
index 6c47b559e6e1e91d1ed4d7d4cc6e02413901f58a..c6f1ea394d8fd908b5ca4c040a15c2a3ff4165b3 100644 (file)
--- a/tests/data/test270
+++ b/tests/data/test270
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ RETR 270
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test271 b/tests/data/test271
index d650f9a31ade0bf5ac006d973d477c4454dd3262..af5a6c60318f5dd90ae6487d1a80c585d7a13ed6 100644 (file)
--- a/tests/data/test271
+++ b/tests/data/test271
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 TFTP
@@ -39,3 +40,4 @@ filename: /271
 mode: octet
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test272 b/tests/data/test272
index e8cac9219b1384fe420e91e59dfcae5b522e2e8d..d47f50c3cbf62d42d0f43b826408398b59a80fb4 100644 (file)
--- a/tests/data/test272
+++ b/tests/data/test272
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -36,3 +37,4 @@ MDTM 272
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test273 b/tests/data/test273
index 6aabfdcbd381f2213195b873c1f6a16aea73b40b..626107951f8db58d24fc46f9e5451592e299dd1d 100644 (file)
--- a/tests/data/test273
+++ b/tests/data/test273
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -76,3 +77,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test274 b/tests/data/test274
index 4eac4d5fd30443e48797702ac26a4ca2f6e61cc1..7d010b4ffc3137998682d6e39e9a84409887cb0e 100644 (file)
--- a/tests/data/test274
+++ b/tests/data/test274
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -48,3 +49,4 @@ Accept: */*
 47
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test275 b/tests/data/test275
index fea185018f264885c082b129dd8a7a56755285e0..e07b1a83e884a8f270e7f8d41768ec319035ffe3 100644 (file)
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -71,3 +72,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test276 b/tests/data/test276
index aa56090f47d4cf8e85be559489fadf34ec73cc3e..b21136713549359c380a2c28c69406bb21d21f31 100644 (file)
--- a/tests/data/test276
+++ b/tests/data/test276
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -72,3 +73,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test277 b/tests/data/test277
index f19e3423d667bb9ffc665ea887e05ef0c745d07c..8051e55223de1ad79b881ac861717e620ea812f5 100644 (file)
--- a/tests/data/test277
+++ b/tests/data/test277
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -55,3 +56,4 @@ daniel
 --------------------------------\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test278 b/tests/data/test278
index 795b090ce6868df6637543ead73a991819909efd..5b24df82c2ad7fd1c8351ac935b42bd5d3a5f51a 100644 (file)
--- a/tests/data/test278
+++ b/tests/data/test278
@@ -1,3 +1,4 @@
+<testcase>
 <info>\r
 <keywords>\r
 HTTP\r
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>\r
 </verify>\r
+</testcase>

diff --git a/tests/data/test279 b/tests/data/test279
index 2483e39d29aa2719526d1d8b67337be0760fa4a3..150c767c8e49222e76bfe396b3935d1dc1c5237d 100644 (file)
--- a/tests/data/test279
+++ b/tests/data/test279
@@ -1,3 +1,4 @@
+<testcase>
 <info>\r
 <keywords>\r
 HTTP\r
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>\r
 </verify>\r
+</testcase>

diff --git a/tests/data/test28 b/tests/data/test28
index 98d19c59d91b26c5ed0e93f7e75793c4567d9c9d..43ea09b23ba83fa023442a75f3ccc3d2b89c2695 100644 (file)
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -71,3 +72,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test280 b/tests/data/test280
index a354c31c62514333ae30380860f511d08bd688b1..3bf2f953fc699856f4120f63bc73505da11f2912 100644 (file)
--- a/tests/data/test280
+++ b/tests/data/test280
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -62,3 +63,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test281 b/tests/data/test281
index f228d2d0b0b1e4ce80bcd12948c4f8cc32778ba9..d399fc05b6c0ce70ae52d4c9c6403e72663861f7 100644 (file)
--- a/tests/data/test281
+++ b/tests/data/test281
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -61,3 +62,4 @@ Weird
    upload
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test282 b/tests/data/test282
index b15745b18a7896718ab612fcbcb79c67ed874f02..557e461440f43d45bbd5ad6260e3d21d7ce9ba58 100644 (file)
--- a/tests/data/test282
+++ b/tests/data/test282
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -41,3 +42,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test283 b/tests/data/test283
index 54e86fe8014003cf8dd3b305e85d6dfec35afe56..e470c87fcdb321a78674d9d87e337372f4922a31 100644 (file)
--- a/tests/data/test283
+++ b/tests/data/test283
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 TFTP
@@ -31,3 +32,4 @@ filename: /invalid-file
 mode: octet
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test284 b/tests/data/test284
index f04fef58981c41c6d46de7184019c54356161909..0c2a665601c7300a831da9f3944898241e4e260b 100644 (file)
--- a/tests/data/test284
+++ b/tests/data/test284
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 TFTP
@@ -63,3 +64,4 @@ filename: /284
 mode: octet
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test285 b/tests/data/test285
index 72f0455ddad5bbcc6bf1bfaf85a8a6fed82dbdd3..75a19991d9bfc2d9fa9d4b1f079617bda44d2e15 100644 (file)
--- a/tests/data/test285
+++ b/tests/data/test285
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 TFTP
@@ -40,3 +41,4 @@ filename: /test285.txt
 mode: octet
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test286 b/tests/data/test286
index d78e24f3a2632eec7ed5c2e00d10e5c9272fa5fc..841ee1e2a330a84c96124757f74024edf078f329 100644 (file)
--- a/tests/data/test286
+++ b/tests/data/test286
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 TFTP
@@ -88,3 +89,4 @@ filename: /test286.txt
 mode: octet
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test29 b/tests/data/test29
index 5d18c39ae8d464e7bdd8afcf68a8185e2f45d75b..640e312fc41efacd7bf58db5c15949235f571254 100644 (file)
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -48,3 +49,4 @@ Accept: */*
 28
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test3 b/tests/data/test3
index 2dc78967e1b76057d1472960e872d73b437c599f..c1b542eef97383951124b187349588e2c2f18df8 100644 (file)
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -45,7 +46,7 @@ HTTP POST with auth and contents but with content-length set to 0
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /3 HTTP/1.1\r
 Authorization: Basic ZmFrZTotdXNlcg==\r
 Host: 127.0.0.1:%HTTPPORT\r
@@ -56,3 +57,4 @@ Content-Type: application/x-www-form-urlencoded
 fooo=mooo&pooo=clue&doo=%20%20%20++++
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test30 b/tests/data/test30
index efb18364030117ef6bec5c6aa710cf658c308740..218dd9657549c35cb3b54a6fa8f174fb2525a22c 100644 (file)
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -39,3 +40,4 @@ Accept: */*
 52
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test300 b/tests/data/test300
index 1c2d3b12d3914c5a3d485b1f831ffb19a39886d3..0d7896cbf0668aeb902903c431747017f8ed35e6 100644 (file)
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -41,3 +42,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test301 b/tests/data/test301
index a93559b780c05c417e7e98d10ce925e77f090f60..ff38deaec53fd47d6f9c1c299a6dd76bb2672e30 100644 (file)
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -45,3 +46,4 @@ Accept: */*
 [insert full protocol verifiction dump here]
 </data>
 </verify>
+</testcase>

diff --git a/tests/data/test302 b/tests/data/test302
index 2f6e381c82a2b7b4defb0f23a2032d2941cf23f2..bb48e9e469e7a9869eacb2f5bf3aa094be30c0ac 100644 (file)
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -36,3 +37,4 @@ HTTPS GET over HTTP proxy fails
 [insert full protocol verifiction dump here]
 </data>
 </verify>
+</testcase>

diff --git a/tests/data/test303 b/tests/data/test303
index bf221f889630acbc73ec940824c56ca481022d9c..191fd547464eaac79273e227b218c832ce19ec89 100644 (file)
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -43,3 +44,4 @@ Accept: */*
 28
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test304 b/tests/data/test304
index 459034c2c617f51cc23400e44fe95535355e3b74..9678e8cb1ea096b5cd1dd1db27e9c1e547528974 100644 (file)
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -61,3 +62,4 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 ------------------------------c3b2ef7f0bb8--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test305 b/tests/data/test305
index 0e01ea2e94f22c31d69c9fd3ed61a11f0f3c02e9..4f77334bba84d99edaa48b6a86c0280f32ee733c 100644 (file)
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -31,3 +32,4 @@ https://%HOSTIP:%HTTPSPORT/want/305 --cacert moooo
 77
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test306 b/tests/data/test306
index c0f3f09e1eac85f76a459171690ccdb57840cfa4..c70feda5489bc6d91655a1be5198b15dd39387fe 100644 (file)
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -54,3 +55,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test307 b/tests/data/test307
index 5d626d75d540cc0760108966fd4820b251b3cd38..093555cc31cb9720ad3104f64e9daac0eaf0f028 100644 (file)
--- a/tests/data/test307
+++ b/tests/data/test307
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -45,3 +46,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test308 b/tests/data/test308
index 136088b6b5993af0b217fcf62f035f37d08387aa..cc7b32296cc2160fe4e2dd076da9368403860404 100644 (file)
--- a/tests/data/test308
+++ b/tests/data/test308
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Client-side
 <client>
@@ -22,3 +23,4 @@ simple HTTPS GET with invalid crypto engine
 53
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test31 b/tests/data/test31
index 744129d20083eccdc9a5b1b2cf56510856aa4acd..a9aec7722cb433805673172464bdf9d422e6d952 100644 (file)
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -54,7 +55,7 @@ Host: 127.0.0.1:%HTTPPORT
 Accept: */*\r
 \r
 </protocol>
-<file name="log/jar31.txt" mode=text>
+<file name="log/jar31.txt" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -64,3 +65,4 @@ Accept: */*
 127.0.0.1      FALSE   /we/want/       FALSE   1391255787      nodomain        value
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test32 b/tests/data/test32
index da0517f0bd0fbb623c30502ddcacfc772a58b495..6ae563092cb9b592f09ea568382ba9acade4f857 100644 (file)
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -52,3 +53,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test33 b/tests/data/test33
index 780c94e04630bcadbe37b66fdf29eb8a1e24975b..8037ce809a6fad0486119bf1f08b7bc76fc1e72d 100644 (file)
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -60,3 +61,4 @@ Expect: 100-continue
 012345678
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test34 b/tests/data/test34
index a05ba75164a8fc7d72fb7be96930a2a37f2fb9db..2c73137ba7967644ade83bb3ca52edc95946d2a0 100644 (file)
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -62,3 +63,4 @@ Accept: */*
 </protocol>
 </verify>
 
+</testcase>

diff --git a/tests/data/test36 b/tests/data/test36
index 8b50e822a7fdb24117e8e707b949dea12be611eb..7219d3d3bcbfbdf4d30dcc68363a68489ae6d5b9 100644 (file)
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -62,3 +63,4 @@ Accept: */*
 </protocol>
 </verify>
 
+</testcase>

diff --git a/tests/data/test37 b/tests/data/test37
index 6d2afc7d4b540a053682059782f99f4a0604c4c0..60e13be899f957235a3f78f4cc4c5189c3715d27 100644 (file)
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -43,3 +44,4 @@ Accept: */*
 </protocol>
 </verify>
 
+</testcase>

diff --git a/tests/data/test38 b/tests/data/test38
index bf8cce8bdb8d18f78782deb124876a0c838d64d1..ddc4c31a31c26002330cb53e1b4f2af6339c7cfe 100644 (file)
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ FAILURE
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.0 200 Mooo
 Date: Mon, 13 Nov 2000 13:41:09 GMT
 Server: myown/1.0
@@ -57,3 +58,4 @@ This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test39 b/tests/data/test39
index 862a24385352981c657222aa153280a443ebf8bc..9a076b0e041d33388c02cfdaf148323b3970dcc7 100644 (file)
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -87,3 +88,4 @@ foo
 ------------------------------24e78000bd32--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test4 b/tests/data/test4
index 342afadcd67981301c6580699ee3aa77d0167668..7bdfa0157279dffa9649a2230d70ef669a761e0d 100644 (file)
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Accept: replaced
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test40 b/tests/data/test40
index c3bbe795623f126a540d3bf2747f05a80ff6cba9..28daa018e2ef40cb7c85cdeb6e0c21d0868f4027 100644 (file)
--- a/tests/data/test40
+++ b/tests/data/test40
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test41 b/tests/data/test41
index 025ba4ca9f336171aeb093454ac626d201755c47..08eca38c9bafd804ed4660acb842bb3ab6636240 100644 (file)
--- a/tests/data/test41
+++ b/tests/data/test41
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -28,3 +29,4 @@ http://%HOSTIP:%HTTPPORT/want/41 -F moo=@boo
 26
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test42 b/tests/data/test42
index df0edd5dd5b830a71acd9155737743e73ed94665..5f52bbfbbcf90f81e41d1347e36fc40eb1c40979 100644 (file)
--- a/tests/data/test42
+++ b/tests/data/test42
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test43 b/tests/data/test43
index fe6c54e18c7ab276db4576750800ff58248db59f..8db36749124aa24cd6aad8f91501e9778458066d 100644 (file)
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -77,3 +78,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test44 b/tests/data/test44
index beea1cf6eada11ac7a1670d03d96e75378001542..2d91d7f662479634d5d8af75c7755be06eb89b53 100644 (file)
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -68,3 +69,4 @@ bar
 ------------------------------7c633d5c27ce--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test45 b/tests/data/test45
index b8d96f7e6855736f22f07d173d42f4ced7ef04a9..7faa1ccaffeaca945018444d675490714dcf54ae 100644 (file)
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -72,3 +73,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test46 b/tests/data/test46
index 8ebdcf8fdae5c4b29153b8ed351bdb7938829c75..563ba073578d55d787ed3f95f09ff062c92965f5 100644 (file)
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -60,7 +61,7 @@ Accept: */*
 Cookie: empty=; mooo=indeed\r
 \r
 </protocol>
-<file name="log/jar46" mode=text>
+<file name="log/jar46" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -76,3 +77,4 @@ www.loser.com FALSE   /       FALSE   1139150993      UID     99
 127.0.0.1      FALSE   /want/  FALSE   0       simplyhuge      zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test47 b/tests/data/test47
index 835fcec190d3868b65bdb15b49eb2bc2bd6d496b..e00b4422a8b20610bb3efb27509bb2fdfe8f72df 100644 (file)
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -13,7 +14,7 @@ HTTP/1.0 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 
-<foo> within foo </foo>
+-foo- within foo -!foo-
 </data>
 </reply>
 
@@ -45,3 +46,4 @@ Accept: */*
 </protocol>
 </verify>
 
+</testcase>

diff --git a/tests/data/test48 b/tests/data/test48
index 036f739e91f5da978e2b493a28bac3da0bc1be36..69d2fd310929cb4d8e424b8cf331eae451e761e9 100644 (file)
--- a/tests/data/test48
+++ b/tests/data/test48
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -43,3 +44,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test49 b/tests/data/test49
index 8822434eff9c7278862bbbeb824a4fd8d4a14176..002e7d17691b93bec7c6949a9e82c1e893710877 100644 (file)
--- a/tests/data/test49
+++ b/tests/data/test49
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test5 b/tests/data/test5
index db8aec2d0640b8b61355488e49cebc899caeac3f..59c8f47b80383f7d293724958e6339a5c1d10ac4 100644 (file)
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test50 b/tests/data/test50
index e508cc0865ec1dc3c64f4560c1727dfd97ad8caa..8cdd62b3f5e2160d118412c2348f1e68aef738d2 100644 (file)
--- a/tests/data/test50
+++ b/tests/data/test50
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test500 b/tests/data/test500
index eafd138251cd950daaf60d4b0dd7c59be5e8a72b..2e53cebfcfc4ab4dddd9fda800e7ba39b95beffb 100644 (file)
--- a/tests/data/test500
+++ b/tests/data/test500
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply name="1">
@@ -13,7 +14,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -45,3 +46,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test501 b/tests/data/test501
index 3a0334b3b2ecd2f0db37c2804dd38c455126acc1..f8a8591572b0f059aa241b26988a3e3f01049217 100644 (file)
--- a/tests/data/test501
+++ b/tests/data/test501
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply name="1">
@@ -28,3 +29,4 @@ http://%HOSTIP:%HTTPPORT/501
 3
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test502 b/tests/data/test502
index 4ef6e5d9ceba3c11ff54b82dead55bcc58d682e0..99dc2f0298c5b0ce3eda74ae7537646a47f698cd 100644 (file)
--- a/tests/data/test502
+++ b/tests/data/test502
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -38,3 +39,4 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 </verify>
+</testcase>

diff --git a/tests/data/test503 b/tests/data/test503
index 5fd45be41ccd9d32d164fe8c1159a514a6a9139f..730f5b778dc27108a61c6cea47fc20669252c220 100644 (file)
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -60,3 +61,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test504 b/tests/data/test504
index 32cff5f71e0e2d8b49478bbc8b2bcf768d24ecb7..488fb5c7747d27e59f6ff2a384b967eaf0bcca55 100644 (file)
--- a/tests/data/test504
+++ b/tests/data/test504
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -26,3 +27,4 @@ http://%HOSTIP:%HTTPSPORT/504 127.0.0.1:55555
 100
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test505 b/tests/data/test505
index 84cb0091099cb6a6d23475c2e95b1668d884001a..fa2ea20ca5a62677aa6b4bd9157604a71dae02b7 100644 (file)
--- a/tests/data/test505
+++ b/tests/data/test505
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -56,3 +57,4 @@ RNTO 505-forreal
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test506 b/tests/data/test506
index 5f0597f75f0316e8b28574d21d7b35fe9849714a..8b3aeedf6157f1fb4f25d38b2a2cb9e9263f76b1 100644 (file)
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data1>
@@ -160,3 +161,4 @@ http://%HOSTIP:%HTTPPORT/506
 .host.foo.com  TRUE    /       FALSE   1170330987      test5   five
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test507 b/tests/data/test507
index 59266dfbb5ea93e3c0ceafc381992a45952c0469..bd4bada99b879fb0631f76eb0e507495bb64ae38 100644 (file)
--- a/tests/data/test507
+++ b/tests/data/test507
@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -24,3 +25,4 @@ http://doesnotexist.foo./
 6
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test508 b/tests/data/test508
index 9ebbaa92ac7394a2cc508e9b9ea52f5a18de36b5..8f3662b0c84d30ee55aa772866993f7f4ecfd097 100644 (file)
--- a/tests/data/test508
+++ b/tests/data/test508
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -43,3 +44,4 @@ Content-Type: application/x-www-form-urlencoded
 this is what we post to the silly web server
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test509 b/tests/data/test509
index 0bf6d3da039f537e4d3b84036a5344d0d733e171..bba2d86da0bb227cf93de9c6d85bc0051a3400d9 100644 (file)
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -53,3 +54,4 @@ Accept: */*
 disable
 </valgrind>
 </verify>
+</testcase>

diff --git a/tests/data/test51 b/tests/data/test51
index 73774f488f18a522f32277d3690e87fa91989422..9fbe4cae2ac26d1f16a84d51ef92dbb1008162da 100644 (file)
--- a/tests/data/test51
+++ b/tests/data/test51
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test510 b/tests/data/test510
index 1c883f18d17cbea4f48cab338805eb6f9cff6d51..587f5309808ee76b56917e0544a024d860466bdc 100644 (file)
--- a/tests/data/test510
+++ b/tests/data/test510
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -52,3 +53,4 @@ and a final longer crap: four
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test511 b/tests/data/test511
index 4bcd1a980ee9863a44121ff754f4f8d11c63bcdc..65f9f1c679b86be1c9e483cdcbf627abc6ad0f75 100644 (file)
--- a/tests/data/test511
+++ b/tests/data/test511
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -40,3 +41,4 @@ MDTM 511
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test512 b/tests/data/test512
index 1df968b3669129f456888b5780c4869c9b5739ef..5fe8fe05f9449358640cf86e90a811b0e1f41c0e 100644 (file)
--- a/tests/data/test512
+++ b/tests/data/test512
@@ -1,7 +1,8 @@
+<testcase>
 #
 # Server-side
 <reply>
-<data mode=text>
+<data mode="text">
 HTTP/1.1 200 OK swsclose\r
 Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 Server: yes\r
@@ -42,3 +43,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test513 b/tests/data/test513
index 44063bc1885048a78ab9e707763d6054d36a5665..2d4e3b0d7f2e1a05703bac74fa3582a8bb94250a 100644 (file)
--- a/tests/data/test513
+++ b/tests/data/test513
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -37,3 +38,4 @@ Content-Type: application/x-www-form-urlencoded
 42
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test514 b/tests/data/test514
index 5db18b3569d01db771508fcd51a51563439cdd88..c61a4a6da6f1134ab891538a353c054a70e6e3a7 100644 (file)
--- a/tests/data/test514
+++ b/tests/data/test514
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -46,3 +47,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test515 b/tests/data/test515
index c2dd48fe8444b3bef7b17cf9eb597e6854c66e12..9de0ac2b9b45e427ce9b354c871f7ba1d2636b3f 100644 (file)
--- a/tests/data/test515
+++ b/tests/data/test515
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -44,3 +45,4 @@ Content-Type: application/x-www-form-urlencoded
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test516 b/tests/data/test516
index 3a8210f224839f7df26684aed21e3dbbdff30dc3..22c39dc5eb4f0a7944b3e9ae9c7a7c2671791b6b 100644 (file)
--- a/tests/data/test516
+++ b/tests/data/test516
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -43,3 +44,4 @@ Content-Length: 0
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test517 b/tests/data/test517
index 3254855d973835bc924772562bf41de31f0951cb..8673139ce5212e795d3d80be74f41417afc696cf 100644 (file)
--- a/tests/data/test517
+++ b/tests/data/test517
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -24,7 +25,7 @@ nothing
 #
 # Verify data after the test has been "shot"
 <verify>
-<stdout mode=text>
+<stdout mode="text">
 0: Sun, 06 Nov 1994 08:49:37 GMT => 784111777
 1: Sunday, 06-Nov-94 08:49:37 GMT => 784111777
 2: Sun Nov  6 08:49:37 1994 => 784111777
@@ -57,3 +58,4 @@ nothing
 # for this kind of things.
 
 </verify>
+</testcase>

diff --git a/tests/data/test518 b/tests/data/test518
index d050d073f88bf91251b779fa3041a29178cf1d56..86c62cb58448541bda49062f228114bca0499f0d 100644 (file)
--- a/tests/data/test518
+++ b/tests/data/test518
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -13,7 +14,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -53,3 +54,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test519 b/tests/data/test519
index e86acabd2531d4b073aa0b477d5e12cbfb0117c2..c6bc8615bd969c415dd1472c6ee1ef9bc024f368 100644 (file)
--- a/tests/data/test519
+++ b/tests/data/test519
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -67,3 +68,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test52 b/tests/data/test52
index ae78473cd10b01fc53190eee8168f90f2919bd8c..d316331e9ecf846949e4c929847c7b375edf98f2 100644 (file)
--- a/tests/data/test52
+++ b/tests/data/test52
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -70,3 +71,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test520 b/tests/data/test520
index b12f47cc2e60b209199c7e3c826c9a1600d22d3e..fe942bad41bad115c0e98b07ffdc8733313b83e6 100644 (file)
--- a/tests/data/test520
+++ b/tests/data/test520
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -43,3 +44,4 @@ RETR 520
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test521 b/tests/data/test521
index 747037c85c87d399d2af369b4db5e051ad4a9746..012ea18a93dba3e70a8ac9f307c642fe40df1f2d 100644 (file)
--- a/tests/data/test521
+++ b/tests/data/test521
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -59,3 +60,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test522 b/tests/data/test522
index 753526c84415a83f075cb7b9222c6d69729c255f..eb56dc3fae0337a5099eb5d6e863d612ed2d0c89 100644 (file)
--- a/tests/data/test522
+++ b/tests/data/test522
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -9,7 +10,7 @@ CURLOPT_PORT
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -56,3 +57,4 @@ Accept: */*
 hello
 </stdout>
 </verify>
+</testcase>

diff --git a/tests/data/test523 b/tests/data/test523
index e86f3a5b215e31eea5d9a9d38863ce770c695b88..0459d2caf166e34da5f4c993f1161937d77d1319 100644 (file)
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -10,7 +11,7 @@ CURLOPT_PROXY
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -56,7 +57,8 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
-<stdout mode=text>
+<stdout mode="text">
 hello
 </stdout>
 </verify>
+</testcase>

diff --git a/tests/data/test524 b/tests/data/test524
index 36946667c9215155eea46268a2ca415c160221d0..98805f4f7f1c05dd7521eb9a66ea2ed196fefe27 100644 (file)
--- a/tests/data/test524
+++ b/tests/data/test524
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -42,3 +43,4 @@ PWD
 3
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test525 b/tests/data/test525
index d26490e7c5756875e31e0590dcf2a0f9aa3730c7..0e3353d7bae876977e39d48b7b1c049d66e2e7d9 100644 (file)
--- a/tests/data/test525
+++ b/tests/data/test525
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -53,3 +54,4 @@ Moooooooooooo
  upload this
 </upload>
 </verify>
+</testcase>

diff --git a/tests/data/test526 b/tests/data/test526
index 29d99598306f0e0baa2597989c1434622b3c1ba4..5d45b5c20f761784e3962e55684e2a4fd3a279be 100644 (file)
--- a/tests/data/test526
+++ b/tests/data/test526
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -59,3 +60,4 @@ RETR 526
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test527 b/tests/data/test527
index f00a5c69fb803d1240fd3720c6b204affd32b0c1..2a6df836acf7bc92543f2d29ba198ef8f1326830 100644 (file)
--- a/tests/data/test527
+++ b/tests/data/test527
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -59,3 +60,4 @@ RETR 527
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test528 b/tests/data/test528
index 2bfdc20ce8a9c8b898ad85abd5dd5f0dd40bc832..1079491d1df52986f7edd20f19306c1d4f4e5eb5 100644 (file)
--- a/tests/data/test528
+++ b/tests/data/test528
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -60,3 +61,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test529 b/tests/data/test529
index d5c657d30f9fe714b3fddf371a4b5cd82e07f853..36643ff951234b4bd62cd6750ffe0921292cb3f9 100644 (file)
--- a/tests/data/test529
+++ b/tests/data/test529
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -53,3 +54,4 @@ Moooooooooooo
  upload this
 </upload>
 </verify>
+</testcase>

diff --git a/tests/data/test53 b/tests/data/test53
index c653c355b87c8648b2bcd06c15a91321e11a76aa..4c79c6cf472bb1f54a9fb0752ae60f204d22cb72 100644 (file)
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -50,3 +51,4 @@ Cookie: mooo=indeed
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test530 b/tests/data/test530
index 671efd85c84f679001389217d030c8590d3aafa7..5586d6e91f770c3b107c4221f8e3f2dba842c63c 100644 (file)
--- a/tests/data/test530
+++ b/tests/data/test530
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -76,3 +77,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test531 b/tests/data/test531
index 0909e812a98fc9d6c107d3eaceae9a29b0fda0d4..8e577c981251d2b7560e7ff7bf533055e2158d9b 100644 (file)
--- a/tests/data/test531
+++ b/tests/data/test531
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -53,3 +54,4 @@ QUIT
 </protocol>
 
 </verify>
+</testcase>

diff --git a/tests/data/test532 b/tests/data/test532
index 5421f81a7cefed245014fd9b3864bbc45b2754b1..5a509ef3d522cd16937eb06cc0547c256b31231f 100644 (file)
--- a/tests/data/test532
+++ b/tests/data/test532
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -59,3 +60,4 @@ RETR 532
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test533 b/tests/data/test533
index 578daf8ce195ed99abff95a1912eab7c21f5c487..58db1950f8cf370519c3592d4f1e95e66cc7a002 100644 (file)
--- a/tests/data/test533
+++ b/tests/data/test533
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -51,3 +52,4 @@ RETR 533
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test534 b/tests/data/test534
index 5676b77e4e4165018fc2d8b5ac875a41c0cff40d..19755377c8f57448e49ac56caac052bccdd9d162 100644 (file)
--- a/tests/data/test534
+++ b/tests/data/test534
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -48,3 +49,4 @@ RETR 534
 QUIT\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test535 b/tests/data/test535
index ea43a1ab6ccccfe1e81f81a06f2611ec553a3585..adfc9e173d176a137410529f0eec4142f73fa612 100644 (file)
--- a/tests/data/test535
+++ b/tests/data/test535
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <data mode="text">
 HTTP/1.1 404 Badness
@@ -57,3 +58,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test536 b/tests/data/test536
index eeadf0d7738410080963ac1534f55e1467519469..f1ed5e3496a93526c72e883f2b0a48ab89683db3 100644 (file)
--- a/tests/data/test536
+++ b/tests/data/test536
@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <data mode="text">
 HTTP/1.1 404 Badness
@@ -61,3 +62,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test537 b/tests/data/test537
index 85f07327b21c37dd42c10354221a7aa4c50bc834..d00b4c05de3b8bcd7dcc2b0367d9a1ec5f5441c0 100644 (file)
--- a/tests/data/test537
+++ b/tests/data/test537
@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -13,7 +14,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -53,3 +54,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test538 b/tests/data/test538
index 6ad2aac1300901d66dd01dfc29ff53f91b4029ff..24d9603250a39fe60e5e5492586d630becdb1954 100644 (file)
--- a/tests/data/test538
+++ b/tests/data/test538
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -40,3 +41,4 @@ USER anonymous
 PASS curl_by_daniel@haxx.se\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test54 b/tests/data/test54
index 0d5747eb6518b206b6ad5bbb078d3d7cd8b5c46e..8c42df70a2100c0c388ccfd6f248215a4f919528 100644 (file)
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -41,3 +42,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test55 b/tests/data/test55
index c4a6e4c9b0ce83b6006ccc19f3ad474d89612ef1..53108de101b32161b800e016b24b7a4a9479eaa8 100644 (file)
--- a/tests/data/test55
+++ b/tests/data/test55
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -62,3 +63,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test56 b/tests/data/test56
index d84b86ddcbc2525def575ce8a01461148884eb87..43cd3bf0861b974ed31a55613f9166ce26f981ec 100644 (file)
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -58,3 +59,4 @@ we post this
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test57 b/tests/data/test57
index 5c63d8c54ce3880fd087469f252484195aab22c7..6676ec56863940fb5392fe108840148775a9a09f 100644 (file)
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -7,7 +8,7 @@ HTTP GET
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK swsclose
 Funny-head: yesyes
 Content-Type: text/html; charset=ISO-8859-4   
@@ -30,7 +31,7 @@ HTTP content-type with spaces in
 
 # Verify data after the test has been "shot"
 <verify>
-<stdout mode=text>
+<stdout mode="text">
 text/html; charset=ISO-8859-4
 </stdout>
 <strip>
@@ -43,3 +44,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test58 b/tests/data/test58
index 32d773192c5b691ffe978527373e4b6c912de5f0..97c74fa4a293e9074d03b1d8249a5dd3ec35fc32 100644 (file)
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Expect: 100-continue
 a few bytes
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test59 b/tests/data/test59
index 7ea59af86cb879063b4d5b973fa3d17d9bc359db..87a8af94ee698a4c1b928f5d2f02416f5cc69684 100644 (file)
--- a/tests/data/test59
+++ b/tests/data/test59
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -43,3 +44,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test6 b/tests/data/test6
index f7f1a4f0dd44b323c4e409158232ce75f3c1ce47..5c0de9eedc677be05395467bbb766ce023d3afcb 100644 (file)
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -44,3 +45,4 @@ Cookie: name=contents;name2=content2
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test60 b/tests/data/test60
index c4d6c4fb426299a414f312ec933476ae8d02d932..be6dccf832bb097b1f2125dcb3cc350e725fb918 100644 (file)
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -52,3 +53,4 @@ more than one byte
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test61 b/tests/data/test61
index 59c5eb271743b694097d69193993fd7792bb50c3..5ccd7724de3b21d36aab2c8a5af045aa194e778f 100644 (file)
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -50,7 +51,7 @@ Accept: */*
 Host: www.host.foo.com\r
 \r
 </protocol>
-<file name="log/jar61.txt" mode=text>
+<file name="log/jar61.txt" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -60,3 +61,4 @@ Host: www.host.foo.com
 .foo.com       TRUE    /moo    TRUE    0       test3   maybe
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test62 b/tests/data/test62
index fd08f7e5f1796c9005594df1e2eb54978ebb5675..a2f9ec511ac995ac3963e3d5446f581de31aa2a4 100644 (file)
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -53,3 +54,4 @@ Host: www.host.foo.com
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test63 b/tests/data/test63
index 179b9e6b89403dd62f468bf4137911d94fef1925..667fc104be80123340b5d6f6cac7f46271f362d2 100644 (file)
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -49,3 +50,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test64 b/tests/data/test64
index e2ba87dcdd778c4afa68a26daa2450890818e6c3..4add34789181bb036174bdcea88b97e7312c0356 100644 (file)
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -76,3 +77,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test65 b/tests/data/test65
index ab519f91665100123d6322eeac0b7c13ca3eaaa6..097c58afd9c573f11708678569a49a1050ab641b 100644 (file)
--- a/tests/data/test65
+++ b/tests/data/test65
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -76,3 +77,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test66 b/tests/data/test66
index a67cf6386375122e5172ec2d5b8bff76a3605b19..e088d64dd229afb82e1e52d9c48fffb27ad40c44 100644 (file)
--- a/tests/data/test66
+++ b/tests/data/test66
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -37,3 +38,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test67 b/tests/data/test67
index 16a634d678cac70de5804ec81a9cc8d2bdc216b7..e2d30da040f57c567e710c6a8d23a02c3ef15da5 100644 (file)
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,10 +9,11 @@ HTTP NTLM auth
 # Server-side
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
@@ -91,3 +93,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test68 b/tests/data/test68
index 7367061f56c8a27051d886a664d418db630904c5..85586ff5413720996905c3f11c6aa852e2b39221 100644 (file)
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -91,3 +92,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test69 b/tests/data/test69
index 573bdfbb08da071ca976b4bb34c22bc78d91eeff..e773f7043416a4e29696f2a38386c7c31fa0e462 100644 (file)
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -113,3 +114,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test7 b/tests/data/test7
index cf15ff484dcf7076c4aad21d8f338a1b20b926f1..b90cc721c0fbe6b18fa620384d3c7a9e0fcd2c99 100644 (file)
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -56,3 +57,4 @@ Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
 
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test70 b/tests/data/test70
index 0c904ef7ec807b571412530c3e288c76aa7afcc7..f91a3c059e4da353a7d70a3c177d7c2270fc2ed1 100644 (file)
--- a/tests/data/test70
+++ b/tests/data/test70
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -83,3 +84,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test71 b/tests/data/test71
index baedaab893d4f01aa588a4602eed894065cd8bb0..7a938095ce86cd794a9eb61deaeeb34edd45edbb 100644 (file)
--- a/tests/data/test71
+++ b/tests/data/test71
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -74,3 +75,4 @@ bar
 ------------------------------9ef8d6205763--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test72 b/tests/data/test72
index 465c61199fb361460210d51f0174ead566e34570..77f2b22852e7163a327e55a9570a01eaf3cdfba0 100644 (file)
--- a/tests/data/test72
+++ b/tests/data/test72
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -79,3 +80,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test73 b/tests/data/test73
index 6e612eec63d280db54c2dd07f90faf13c422e55c..5941c7254d9eb70c51092f8f6f9ab95deeb0725c 100644 (file)
--- a/tests/data/test73
+++ b/tests/data/test73
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -42,7 +43,7 @@ Accept: */*
 Host: host.NOT_DISCLOSED.se\r
 \r
 </protocol>
-<file name="log/jar73.txt" mode=text>
+<file name="log/jar73.txt" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -50,3 +51,4 @@ Host: host.NOT_DISCLOSED.se
 .NOT_DISCLOSED.se      TRUE    /       FALSE   0       IPCZQX01af0fca5c        000010008168c200d25dfc4b
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test74 b/tests/data/test74
index 6a0793d7c3483ad028b13358f7189f92d28fbc08..7cb582de8c72a32027de247ead4336b150508b1f 100644 (file)
--- a/tests/data/test74
+++ b/tests/data/test74
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ HTTP GET
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -19,7 +20,7 @@ Content-Length: 6
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 <data1>
 HTTP/1.0 200 OK
@@ -40,7 +41,7 @@ http
  <name>
 HTTP, urlglob {}-retrieval and -o #[num] usage
  </name>
- <command option=no-output>
+ <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/{74,740001}" -o "log/dumpit#1.dump"
 </command>
 </client>
@@ -70,3 +71,4 @@ Connection: close
 crap data
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test75 b/tests/data/test75
index 6aeaf14c4053deec5fad4262d3c27d12650c915d..25440f5135f732aaced244d068333ad1e2b778b1 100644 (file)
--- a/tests/data/test75
+++ b/tests/data/test75
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -19,7 +20,7 @@ none
  <name>
 HTTP, urlglob retrieval with bad range
  </name>
- <command option=no-output>
+ <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/[1-1]" -o "log/weee#1.dump" --stderr -
 </command>
 </client>
@@ -33,8 +34,9 @@ HTTP, urlglob retrieval with bad range
 <errorcode>
 3
 </errorcode>
-<stdout mode=text>
+<stdout mode="text">
 curl: (3) [globbing] error: bad range specification after pos 24
 
 </stdout>
 </verify>
+</testcase>

diff --git a/tests/data/test76 b/tests/data/test76
index d6b18ad7c47b4a77fec596e49533b12470366488..d4094038b5da183c0c5bfc8e59ceb601c4c27978 100644 (file)
--- a/tests/data/test76
+++ b/tests/data/test76
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FAILURE
@@ -17,7 +18,7 @@ none
  <name>
 HTTP, -O with no file name part in the URL
  </name>
- <command option=no-output>
+ <command option="no-output">
 http://%HOSTIP:%HTTPPORT/76/ -O
 </command>
 </client>
@@ -32,3 +33,4 @@ http://%HOSTIP:%HTTPPORT/76/ -O
 23
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test77 b/tests/data/test77
index 369120cebb17c177fb3b0e92e8e4e90ae654ba49..3a9d2a742ce7302414cba3cf34d461e0cc1c305d 100644 (file)
--- a/tests/data/test77
+++ b/tests/data/test77
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -19,7 +20,7 @@ Content-Length: 6
 Connection: close
 Content-Type: text/html
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -51,3 +52,4 @@ If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test78 b/tests/data/test78
index a3b2d5b6ebd214238966caa290e98707c932f4d5..9192f5f6acb3d6cbc2eaf1e4fec86df811a6d8f3 100644 (file)
--- a/tests/data/test78
+++ b/tests/data/test78
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -19,7 +20,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 <datacheck>
 HTTP/1.1 200 OK
@@ -63,3 +64,4 @@ If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test79 b/tests/data/test79
index 8954360f09077d8f50b932167419475514c5a128..382eddde7f75b4bed86fa2e7a8ace699a32a51b3 100644 (file)
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -49,3 +50,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test8 b/tests/data/test8
index 50c5d4f2bb713a2a2d9621c75f00b2bdde765358..1dfbfb99200d49d5bc8306ef7ee7ded78f9945fb 100644 (file)
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -56,3 +57,4 @@ Cookie: cookie=yes; partmatch=present; foobar=name
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test80 b/tests/data/test80
index 41656810b48a467263999950c8e8edada458929b..558afdff36206eb8dfeb04e75e31e9c20bedda33 100644 (file)
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -69,3 +70,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test81 b/tests/data/test81
index 95ca2191eb76c47d1a99ee22e209de262c6245a5..5689df807e2db9e74d44051a973e37be76dbf3b4 100644 (file)
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -93,3 +94,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test82 b/tests/data/test82
index 3bfae9fc2ea3c5a1acd94bc9aa4ad8c23d09527e..7d760faed867df519354df3cfd3ca4652087d8a6 100644 (file)
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -52,3 +53,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test83 b/tests/data/test83
index 7c176969f45d6eb472ca40e860fac9da884713a0..182650efea0a1aac867f844282bda547de807855 100644 (file)
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -68,3 +69,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test84 b/tests/data/test84
index 9d5e678b69cd5cb04aed3707ffa250d3857df1b7..c6ca496a97129bcf17fa9453054bc15d940633c9 100644 (file)
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -51,3 +52,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test85 b/tests/data/test85
index a82110769cede08eefc12d93dda494378fdbdeb1..80d83694e7c44b619eaaabdc16ca38e6a2955f20 100644 (file)
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -53,3 +54,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test86 b/tests/data/test86
index e1403962d2accc0a38bc8d178415796b6a66040a..ac611bd29212ab58d7bf7f1318131e398b8b44c0 100644 (file)
--- a/tests/data/test86
+++ b/tests/data/test86
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -8,7 +9,7 @@ HTTP GET
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 <data1>
 HTTP/1.0 200 OK
@@ -54,7 +55,7 @@ http
  <name>
 HTTP, urlglob []-retrieval and -o #[num] usage
  </name>
- <command option=no-output>
+ <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/[860001-860003]" -o "log/dumpit#1.dump"
 </command>
 </client>
@@ -92,3 +93,4 @@ Funny-head: swsclose
 crap data
 </file>
 </verify>
+</testcase>

diff --git a/tests/data/test87 b/tests/data/test87
index 6f047e6fc53fdd760bb77cdffbd9b19c2b1488cf..77316569016e55edb75361fe3bf5aeedb8c1806b 100644 (file)
--- a/tests/data/test87
+++ b/tests/data/test87
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 [] range
@@ -17,7 +18,7 @@ none
  <name>
 urlglob with bad -o #[num] usage
  </name>
- <command option=no-output>
+ <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/[870001-870003]" -o "log/dumpit#2.dump"
 </command>
 </client>
@@ -29,3 +30,4 @@ urlglob with bad -o #[num] usage
 2
 </errorcode>
 </verify>
+</testcase>

diff --git a/tests/data/test88 b/tests/data/test88
index 45791fcba8a19871feae60fc939d762958cb738f..fd7bc94cabd816b19277326007d9bee13c58c69d 100644 (file)
--- a/tests/data/test88
+++ b/tests/data/test88
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -94,3 +95,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test89 b/tests/data/test89
index d3392c6947f9c5759fd0e68b83f38c9a8f38465c..30741bed616d3f7a181060ff00e5be784248080a 100644 (file)
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -9,10 +10,11 @@ followlocation
 # Server-side
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
@@ -136,3 +138,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test9 b/tests/data/test9
index 034a605175c2f6b8172083a34d113f3c7b03c0a4..16793d440ccda5d0b7083178f979a2784e3b2222 100644 (file)
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -69,3 +70,4 @@ bar
 ------------------------------9ef8d6205763--\r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test90 b/tests/data/test90
index 36d6d0cb7e685ce11fa846cbd639a9f432085cf4..755dd4061c8df3d8814a1008485b797ef1ac651d 100644 (file)
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -183,3 +184,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test91 b/tests/data/test91
index 2e9f779e640d97a13b58443e2ef5c61f702624f8..189a6f97d57c11fc75f13d2113ea0b3d3b81fb16 100644 (file)
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -114,3 +115,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test92 b/tests/data/test92
index 3c043aab08e0e73144dc9552b880980d0e6a5c29..0e873689a6cc58326aa8a20ffafa73170ecfadd3 100644 (file)
--- a/tests/data/test92
+++ b/tests/data/test92
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -48,3 +49,4 @@ Accept: */*
 </protocol>
 
 </verify>
+</testcase>

diff --git a/tests/data/test93 b/tests/data/test93
index b98d32bdcc692fc8ddc1ee943c34425df4dabf42..55569ddd8e08b66e96729c08805ff29c8e1673e0 100644 (file)
--- a/tests/data/test93
+++ b/tests/data/test93
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test94 b/tests/data/test94
index 2deeb4f27d33ac8444d2d3e288a8fbaf7fcd11aa..63aae01e430b94d14f7bf4dcba404f66e077c20a 100644 (file)
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTPS
@@ -9,7 +10,7 @@ FAILURE
 #
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 407 Needs proxy authentication
 Server: test-server/fake swsclose yesyes
 Proxy-Authenticate: Basic "oh please"
@@ -53,3 +54,4 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test95 b/tests/data/test95
index d2cd2c4299c61a85498c8861ea32b6f312a5665d..eadcd7a673859a3070f4d62fab9692e507138229 100644 (file)
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -52,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%HTTPPORT -d "datato
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 CONNECT 127.0.0.1:%HTTPPORT HTTP/1.0\r
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
 Host: 127.0.0.1:%HTTPPORT\r
@@ -68,3 +69,4 @@ Content-Type: application/x-www-form-urlencoded
 datatopost=ohthatsfunyesyes
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test97 b/tests/data/test97
index 121ffa4dbb2d4b15ff6802ff84574a2e11a9c9fd..b309ff3e72febbe3b00f4e89a6558d1a2e4e53a3 100644 (file)
--- a/tests/data/test97
+++ b/tests/data/test97
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -38,7 +39,7 @@ HTTP POST with custom content-type
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /97 HTTP/1.1\r
 Host: 127.0.0.1:%HTTPPORT\r
 Accept: */*\r
@@ -48,3 +49,4 @@ Content-Length: 14
 hejsanallabarn
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test98 b/tests/data/test98
index 5878c578fb79494b479398f9019fd4c51a7d087f..fb7aa7d30ac9184f7f132987213631ebde082aac 100644 (file)
--- a/tests/data/test98
+++ b/tests/data/test98
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -51,3 +52,4 @@ Expect: 100-continue
 data on stdin
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/data/test99 b/tests/data/test99
index 49cfdc2860dd04e78861fc079eb10cef9129ca68..2fdb15f9c9bbeddfa42de7910e96752419d78bfc 100644 (file)
--- a/tests/data/test99
+++ b/tests/data/test99
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -64,3 +65,4 @@ Accept: */*
 \r
 </protocol>
 </verify>
+</testcase>

diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index 5a839b12292af8e82932133825c40488c823bace..3453bf313f4b14d623654dae215d5881bd652834 100644 (file)
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -120,6 +120,7 @@ const char *spitout(FILE *stream,
 
   enum {
     STATE_OUTSIDE,
+    STATE_OUTER,
     STATE_INMAIN,
     STATE_INSUB,
     STATE_ILLEGAL
@@ -173,6 +174,10 @@ const char *spitout(FILE *stream,
         cmain[0]=0; /* no main anymore */
         display=0;
       }
+      else if(state == STATE_OUTER) {
+        /* this is the end of the outermost file section */
+        state--;
+      }
     }
     else if(!display) {
       /* this is the beginning of a section */
@@ -182,6 +187,10 @@ const char *spitout(FILE *stream,
       *end = 0;
       switch(state) {
       case STATE_OUTSIDE:
+        /* Ignore the outermost <testcase> element */
+        state = STATE_OUTER;
+        break;
+      case STATE_OUTER:
         strcpy(cmain, ptr);
         state = STATE_INMAIN;
         break;
@@ -214,6 +223,10 @@ const char *spitout(FILE *stream,
       show(("* (%d bytes) %s\n", stringlen, buffer));
       display = 1; /* start displaying */
     }
+    else if ((*cmain == '!') || (*csub == '!')) {
+        /* This is just a comment, not a new section */
+        state--;
+    }
     else {
       show(("%d (%s/%s): %s\n", state, cmain, csub, buffer));
       display = 0; /* no display */