A minor "syntax error" in numerous test files corrected

diff --git a/tests/data/test10 b/tests/data/test10
index e2f0909e65bf664a644b11c0b1ddc11c2f700aa8..cfe53f6cc8b06b09992d0dd84f54c9a303f51347 100644 (file)
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -32,7 +32,7 @@ the
    PUT
       feature
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test100 b/tests/data/test100
index aad4601614d531c27e427cf0dfd514a2bff7cc54..8131fefbfd03824bbafdd3d3885f2f1b599aaf0d 100644 (file)
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -1,6 +1,6 @@
 #
 # Server-side
-<reply name="1">
+<reply>
 <data>
 total 20\r
 drwxr-xr-x   8 98       98           512 Oct 22 13:06 .\r
@@ -28,7 +28,7 @@ FTP dir list PASV
  <command>
 ftp://%HOSTIP:%FTPPORT/
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test101 b/tests/data/test101
index 67f5968e45b751e616053e578bfa00d528ad0c1f..735ef95bb08f51eed916814cfaa490c4e3e03d90 100644 (file)
--- a/tests/data/test101
+++ b/tests/data/test101
@@ -26,7 +26,7 @@ FTP dir list, PORT with specified IP
  <command>
 ftp://%HOSTIP:%FTPPORT/ -P %HOSTIP
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test102 b/tests/data/test102
index ebb58e898c05ea676d99e20a93d7e6ca3f508843..8765c019329a979571c232f204192af9dbb6114a 100644 (file)
--- a/tests/data/test102
+++ b/tests/data/test102
@@ -21,11 +21,11 @@ FTP RETR PASV
  <command>
 ftp://%HOSTIP:%FTPPORT/102
 </command>
-</test>
+
 <file name="log/ftpserver.cmd">
 REPLY EPSV 500 no such command
 </file>
-
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test103 b/tests/data/test103
index d8aa339c34a98823c61be8ac62a41dfa3673b389..54d6d91c77230b115fd60618327fbaaa404179ef 100644 (file)
--- a/tests/data/test103
+++ b/tests/data/test103
@@ -21,7 +21,7 @@ FTP RETR PORT with CWD
  <command>
 ftp://%HOSTIP:%FTPPORT/a/path/103 -P -
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test104 b/tests/data/test104
index b0b9c45efc06f654bd4f6b7d249b50d19f1f1a4e..476c0b30bc86bb5709f174b59ff584728bf16e4c 100644 (file)
--- a/tests/data/test104
+++ b/tests/data/test104
@@ -16,7 +16,7 @@ FTP --head to get file size only
  <command>
 ftp://%HOSTIP:%FTPPORT/a/path/103 --head
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test105 b/tests/data/test105
index 0245592e3fff344c6c7aa8c9bc811a87349b2b8a..e42492b54df4e0bb97ef92d2f6b056c085eb20ed 100644 (file)
--- a/tests/data/test105
+++ b/tests/data/test105
@@ -25,7 +25,7 @@ ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii
 REPLY EPSV 500 no such command
 REPLY SIZE 500 no such command
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test106 b/tests/data/test106
index 359af4f2ea88071825ccf154cd519cb66a816b18..e7576e75e23050102bb40095a4e558f89f648fc0 100644 (file)
--- a/tests/data/test106
+++ b/tests/data/test106
@@ -21,7 +21,7 @@ FTP GET with type=A style ASCII URL using %20 codes
  <command>
 "ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces//and%20things2/106;type=A"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test107 b/tests/data/test107
index c97dbb9a4661be1494a4456d598eeb02f59a57cd..bc6ad6a3e9a5d93fef32e07499a629fb08311b86 100644 (file)
--- a/tests/data/test107
+++ b/tests/data/test107
@@ -18,7 +18,7 @@ works
  <command>
 ftp://%HOSTIP:%FTPPORT/107 -T log/test107.txt
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test108 b/tests/data/test108
index 7ab7b4791d5ce837cdd0a495fd09d2d44b7f7784..f2473752d76db06c450a47f49dcd6f443a08365f 100644 (file)
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -19,7 +19,7 @@ ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T log/upload108 -P -
 Moooooooooooo
  upload this
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test109 b/tests/data/test109
index 1362d5b317a70e3ed3fd0e1f978112e067cda7b7..bad56806917fe4e981120f21b74df0dc1138e8ee 100644 (file)
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -19,7 +19,7 @@ ftp://%HOSTIP:%FTPPORT/109 -T log/upload109 --append
 Moooooooooooo
  upload this
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test11 b/tests/data/test11
index 932dd239191fcfeab2f1a3ddd48730becdd5947e..eb72dfb6554f9b77f12e4472932250672dd36d37 100644 (file)
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -45,7 +45,7 @@ simple HTTP Location: following
  <command>
 http://%HOSTIP:%HTTPPORT/want/11 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test110 b/tests/data/test110
index 38f40c7b7c25c1ad6b90d390aa17502ced7194ee..ac021cf65284fc53830cbee88b9a59e7c1e16ef7 100644 (file)
--- a/tests/data/test110
+++ b/tests/data/test110
@@ -23,7 +23,7 @@ ftp://%HOSTIP:%FTPPORT/110 -C 20
 <file name="log/ftpserver.cmd">
 REPLY EPSV 500 no such command
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test111 b/tests/data/test111
index 0664bfd7706b062f453677b096feb18beda21815..9bd53af550faaab8690ffdd46cb8d9f0a15bc835 100644 (file)
--- a/tests/data/test111
+++ b/tests/data/test111
@@ -16,7 +16,7 @@ FTP download resume beyond file size
  <command>
 ftp://%HOSTIP:%FTPPORT/111 -C 2000
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test112 b/tests/data/test112
index fe3dd52cbb2ee3c9e84cec6f29ad165d9c393b5b..a9f0215322804076cc3035d7b4d54a751f30d461 100644 (file)
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -18,7 +18,7 @@ this is the *****crap******** that we're gonna upload
 
 worx?
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test113 b/tests/data/test113
index 6357897b44ba39ff3c280aa36e31c970883a6766..19dcc558250d52fef1843dee5d460e7ed2867c6e 100644 (file)
--- a/tests/data/test113
+++ b/tests/data/test113
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/113
 <file name="log/ftpserver.cmd">
 REPLY USER 314 bluah you fewl!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test114 b/tests/data/test114
index 0dfff77a06693ace69c288c447c4ef28abe451f7..05555abf9b2b13142079f1517943a8d826fab1f6 100644 (file)
--- a/tests/data/test114
+++ b/tests/data/test114
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/114
 <file name="log/ftpserver.cmd">
 REPLY PASS 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test115 b/tests/data/test115
index 03a5caf1def2d248ac88b1215f0914bdcee25d8e..094af900af910d7c2041296a19a6c152cc4e4abe 100644 (file)
--- a/tests/data/test115
+++ b/tests/data/test115
@@ -17,7 +17,7 @@ ftp://%HOSTIP:%FTPPORT/115
 REPLY PASV 314 bluah you f00l!
 REPLY EPSV 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test116 b/tests/data/test116
index 57ad11ae2bc791b7ee82d0e15ccf80754f199ef6..831a331d71b456a8a00a9e7bcb31b8f616ed3848 100644 (file)
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/116 -P 127.0.0.1
 <file name="log/ftpserver.cmd">
 REPLY PORT 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test117 b/tests/data/test117
index 43a10958e6f3c0e683f8bcaf115766a586679fc8..1e3e155202b8147fd0ab2ec1076fe3aba2f0772e 100644 (file)
--- a/tests/data/test117
+++ b/tests/data/test117
@@ -17,7 +17,7 @@ ftp://%HOSTIP:%FTPPORT/117
 REPLY EPSV 314 bluah you f00l!
 REPLY TYPE 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test118 b/tests/data/test118
index 0cce25cb84214d9cc1ceb35ff69fd89fa9c0f856..4fef967835865658826284ab87bee128399853a4 100644 (file)
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -17,7 +17,7 @@ ftp://%HOSTIP:%FTPPORT/118
 REPLY RETR 314 bluah you f00l!
 REPLY EPSV 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test119 b/tests/data/test119
index 96d30d7e7d555ab8f66e509135b8096fcee7cf5f..b0c7e0f31e5b5d746837065d14cc2fe40f643baf 100644 (file)
--- a/tests/data/test119
+++ b/tests/data/test119
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/119 -P -
 <file name="log/ftpserver.cmd">
 REPLY RETR 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test12 b/tests/data/test12
index 245fde2aee9058756e8884e7eb8bdc8953bc3523..06a2eaeec5de1ca68c610b90eb0e2efd9420f247 100644 (file)
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -29,7 +29,7 @@ HTTP range support
  <command>
 http://%HOSTIP:%HTTPPORT/want/12 -r 100-200
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test120 b/tests/data/test120
index ebc5691cd86603df7b6db1a6bfa1666863030f4e..8c30ea2aab406b145713ff47a5013738de3496bf 100644 (file)
--- a/tests/data/test120
+++ b/tests/data/test120
@@ -24,7 +24,7 @@ ftp://%HOSTIP:%FTPPORT/120 -Q "-DELE file"
 <file name="log/ftpserver.cmd">
 REPLY EPSV 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test121 b/tests/data/test121
index 427d88ba7ad913c75d35e6ee03c5d858e12fce75..00870a25b0ae2191b3425eddc4f59e011a1d7af5 100644 (file)
--- a/tests/data/test121
+++ b/tests/data/test121
@@ -21,7 +21,7 @@ ftp download with post- and pre-transfer delete operations
  <command>
 ftp://%HOSTIP:%FTPPORT/121 -Q "-DELE after_transfer" -Q "DELE before_transfer"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test122 b/tests/data/test122
index 5b7bafe758d321efcf81d8992d03f9c857a78dfd..982684fb721da2702e171c1e67ab29c8c27b0c12 100644 (file)
--- a/tests/data/test122
+++ b/tests/data/test122
@@ -19,7 +19,7 @@ ftp://%HOSTIP:%FTPPORT/122 -C 5
 <file name="log/ftpserver.cmd">
 REPLY EPSV 500 no such command
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test123 b/tests/data/test123
index 3825360b07f107bb5242f306b1f22b3850ba344f..446387dc7b35330386d69bf56bad387365f0accc 100644 (file)
--- a/tests/data/test123
+++ b/tests/data/test123
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/123 -T log/upload123 -C 51
 <file name="log/upload123">
 --------------------------------------------------
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test124 b/tests/data/test124
index f8c20609481ca36e76120064504c263fd6ce34c9..dffef0dd6f5f9fb8e6df232646b07b4a8e513446 100644 (file)
--- a/tests/data/test124
+++ b/tests/data/test124
@@ -20,7 +20,7 @@ ftp://%HOSTIP:%FTPPORT/124
 REPLY PWD 314 bluah you f00l!
 REPLY EPSV 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test125 b/tests/data/test125
index 715eb472e310e00a25262dca46af6c2e99fee972..6a72fcd4e4c14c1767bd1154385f0dee025cecc8 100644 (file)
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/125
 <file name="log/ftpserver.cmd">
 REPLY CWD 314 bluah you f00l!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test126 b/tests/data/test126
index e670a2550599c52f29d221b835b34ae1f38289e4..dd124f9a968fa93ddacbeb28267a752fd501e6b7 100644 (file)
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -19,7 +19,7 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/126
 <file name="log/ftpserver.cmd">
 RETRWEIRDO
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test127 b/tests/data/test127
index 5df4e6aff99a5008d8cf37dab6fde1d78ff0bef4..7e85fd6c12f2916214b5e55f29846c9a7be73c21 100644 (file)
--- a/tests/data/test127
+++ b/tests/data/test127
@@ -16,7 +16,7 @@ FTP --disable-epsv
  <command>
 ftp://%HOSTIP:%FTPPORT/path/to/file/127 --disable-epsv
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test128 b/tests/data/test128
index 8e5d99106f558e386e0bbc88327b85ac08f2b31d..3ec30ff4e67ec99ec4f53d686e863e14bf160379 100644 (file)
--- a/tests/data/test128
+++ b/tests/data/test128
@@ -22,7 +22,7 @@ with
 the
 --crlf option
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test13 b/tests/data/test13
index 45d0768dc7b7307d2ecedaf7f756cc86875e5697..7f7ddf8fe38a4823bd1def25e9053c17bedb4b04 100644 (file)
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -20,7 +20,7 @@ HTTP custom request 'DELETE'
  <command>
 http://%HOSTIP:%HTTPPORT/want/13 -X DELETE
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test130 b/tests/data/test130
index 5693f07b00b8e3d6ddb8d03c489a4ab1fa319c23..76bab63c14239bb3583105bed043693a37ef346f 100644 (file)
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -36,7 +36,7 @@ FTP (optional .netrc; no user/pass) dir list PASV
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test131 b/tests/data/test131
index 6501b8de6eeefee0fbc12c3a879259a99b55583b..d55f3eda29541455cf2eab75870271e4317bd455 100644 (file)
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -36,7 +36,7 @@ FTP (optional .netrc; user/no pass) dir list PASV
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test132 b/tests/data/test132
index 09655701dbd17e504666d6578f3ff2f6c6e5e00c..1ba3fd98efadb29eb8ead92e99ec2a9f3eeb0eb8 100644 (file)
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -36,7 +36,7 @@ FTP (optional .netrc; user/passwd supplied) dir list PASV
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test133 b/tests/data/test133
index 6fda5cd4382a686ca0b201ed530ad8e190a8705b..2678d0b97248f728fe58127367d91eae4a7f16f3 100644 (file)
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -36,7 +36,7 @@ FTP (compulsory .netrc; ignored user/passwd) dir list PASV
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test134 b/tests/data/test134
index 1a256730496be39dadadcf31432b8c86522e6bdb..60913e128e1344e0c50077d8b1951b6d125ab6f1 100644 (file)
--- a/tests/data/test134
+++ b/tests/data/test134
@@ -36,7 +36,7 @@ FTP (optional .netrc; programmatic user/passwd) dir list PASV
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test135 b/tests/data/test135
index d8f4546cf464c93618cec2909218397c9daf197a..53ad36332a3c17fbf559b47b0bcd27b472125ac8 100644 (file)
--- a/tests/data/test135
+++ b/tests/data/test135
@@ -25,7 +25,7 @@ FTP retrieve a byte-range
  <command>
 -r 4-16 ftp://%HOSTIP:%FTPPORT/135
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test136 b/tests/data/test136
index 5e6059bd34943898dc29e3bfa1ea72654d3bc1c6..ffbf9e3b701f886b8fccd35824a976c9756109a1 100644 (file)
--- a/tests/data/test136
+++ b/tests/data/test136
@@ -16,7 +16,7 @@ FTP with user and no password
  <command>
 -u user: ftp://%HOSTIP:%FTPPORT/136
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test137 b/tests/data/test137
index 94b2d67238b9097a3013ef2872606e612a83ac8a..d7475f843c6017f37a53e616546f0a43ec721bf7 100644 (file)
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -19,7 +19,7 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/137
 <file name="log/ftpserver.cmd">
 RETRNOSIZE
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test138 b/tests/data/test138
index 76c91120aa57ce24f2e60bc6cdf2a4c91c7462d2..57577c2d7ca117eaf2e5b52e1794ab17ec5da809 100644 (file)
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -22,7 +22,7 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/138
 <file name="log/ftpserver.cmd">
 RETRNOSIZE
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test139 b/tests/data/test139
index 5990e74188d738b7c892167967d6eb88fb056421..052d1f06befe750fa1cc8adb5869b35e77af646f 100644 (file)
--- a/tests/data/test139
+++ b/tests/data/test139
@@ -19,7 +19,7 @@ FTP download a newer file with -z
  <command>
 ftp://%HOSTIP:%FTPPORT/blalbla/139 -z "1 jan 1989"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test14 b/tests/data/test14
index bbc4ba68d64895ad9d965070a06d60db563fc7a1..97afba36ded8de8b0090684dad9416d57652cf92 100644 (file)
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -19,7 +19,7 @@ HTTP HEAD with Connection: close
  <command>
 http://%HOSTIP:%HTTPPORT/want/14 -i --head
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test140 b/tests/data/test140
index 5112dfa91a825732e0003799d98eee3fcb9ac498..c030694ce4035faaed3bfe8733353ec071ab4fa6 100644 (file)
--- a/tests/data/test140
+++ b/tests/data/test140
@@ -18,7 +18,7 @@ FTP download file with -z, expected to not transfer
  <command>
 ftp://%HOSTIP:%FTPPORT/blalbla/140 -z "1 jan 2004"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test141 b/tests/data/test141
index bbec45a19496421ebe2f7032f87609bc4ba21183..65be0474b11bb75ac81884ea211b814bb0e79265 100644 (file)
--- a/tests/data/test141
+++ b/tests/data/test141
@@ -18,7 +18,7 @@ FTP download info with -I
  <command>
 ftp://%HOSTIP:%FTPPORT/blalbla/141 -I
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test142 b/tests/data/test142
index b69550bcce729cb8260f6b016122369f023e9e9c..2061c9200a6f0bfc50d60a1ea0b26be3fed11597 100644 (file)
--- a/tests/data/test142
+++ b/tests/data/test142
@@ -16,7 +16,7 @@ FTP URL with 150 dir levels
  <command>
 ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/part10/part11/part12/part13/part14/part15/part16/part17/part18/part19/part20/part21/part22/part23/part24/part25/part26/part27/part28/part29/part30/part31/part32/part33/part34/part35/part36/part37/part38/part39/part40/part41/part42/part43/part44/part45/part46/part47/part48/part49/part50/part51/part52/part53/part54/part55/part56/part57/part58/part59/part60/part61/part62/part63/part64/part65/part66/part67/part68/part69/part70/part71/part72/part73/part74/part75/part76/part77/part78/part79/part80/part81/part82/part83/part84/part85/part86/part87/part88/part89/part90/part91/part92/part93/part94/part95/part96/part97/part98/part99/part100/part101/part102/part103/part104/part105/part106/part107/part108/part109/part110/part111/part112/part113/part114/part115/part116/part117/part118/part119/part120/part121/part122/part123/part124/part125/part126/part127/part128/part129/part130/part131/part132/part133/part134/part135/part136/part137/part138/part139/part140/part141/part142/part143/part144/part145/part146/part147/part148/part149/part150/142
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test143 b/tests/data/test143
index c8a8cbbc3b5fc8535b5193fb0255211c1ec9b044..157bdd9eadaad9ee27ee101042ad718df02a36be 100644 (file)
--- a/tests/data/test143
+++ b/tests/data/test143
@@ -16,7 +16,7 @@ FTP URL with type=a
  <command>
 "ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/143;type=a"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test144 b/tests/data/test144
index 7afaf94331755b7bf6fcb11b8ffc08c5de372af5..e47baf2096363a72dd9a44fe13e041d70f858585 100644 (file)
--- a/tests/data/test144
+++ b/tests/data/test144
@@ -18,7 +18,7 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l
 <file name="log/ftpserver.cmd">
 REPLY NLST 450 No files found
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test145 b/tests/data/test145
index 3747a98b5af40f7a89ba25e0bcdf3e528e0b3db6..b279bdaa419e12b40def5bc1325897a00eace389 100644 (file)
--- a/tests/data/test145
+++ b/tests/data/test145
@@ -18,7 +18,7 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l
 <file name="log/ftpserver.cmd">
 REPLY NLST 550 Have a taste on this!
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test146 b/tests/data/test146
index 1909b6b8c992790b57cec0d53d6748f7caba5bfa..1de7f38d422da83c383fadb06f514ea85479ad02 100644 (file)
--- a/tests/data/test146
+++ b/tests/data/test146
@@ -16,7 +16,7 @@ persistant FTP with different paths
  <command>
 ftp://%HOSTIP:%FTPPORT/first/dir/here/146 ftp://%HOSTIP:%FTPPORT/146
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test147 b/tests/data/test147
index 35f7f66767293abf48b1f38586156ba2688138a5..b92c75106f2cd147fe034efa21383c5ffc77b59c 100644 (file)
--- a/tests/data/test147
+++ b/tests/data/test147
@@ -16,7 +16,6 @@ FTP with --ftp-create-dirs (failing CWD)
  <command>
 ftp://%HOSTIP:%FTPPORT/first/dir/here/147 --ftp-create-dirs
 </command>
-</test>
 <file name="log/ftpserver.cmd">
 REPLY CWD 550 I won't allow this on my server
 COUNT CWD 1

diff --git a/tests/data/test148 b/tests/data/test148
index 454fee3aece739442b8c41973a2f94775d693a18..5e1f78a10cbe8ab45c3f8210cd4005bdb40688b1 100644 (file)
--- a/tests/data/test148
+++ b/tests/data/test148
@@ -13,7 +13,6 @@ FTP with --ftp-create-dirs (failing MKD)
  <command>
 ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/148 --ftp-create-dirs
 </command>
-</test>
 <file name="log/ftpserver.cmd">
 REPLY CWD 550 I won't allow this on my server
 REPLY MKD 550 We will have no such thing

diff --git a/tests/data/test15 b/tests/data/test15
index d42ab7b4fb92e0454513ac9589ce2ed200fccf9d..325783b84d9ae7922291fb0f224c808d9f19d42d 100644 (file)
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -22,7 +22,7 @@ http
  <command>
 http://%HOSTIP:%HTTPPORT/want/15 --write-out '%{url_effective} %{http_code} %{size_download}\n'
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test150 b/tests/data/test150
index 98648cd8163e57bfc612fdb7239a32e6f446c6e5..b9d92383df66dc687933a9b1b7739b53efc700d7 100644 (file)
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -56,7 +56,7 @@ HTTP with NTLM authorization and --fail
  <command>
 http://%HOSTIP:%HTTPPORT/150 -u testuser:testpass --ntlm --fail
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test151 b/tests/data/test151
index c79ab40dd8a8c73293d4e11f5a281615264f7355..c32d2d8a63cc911b4d5beb95ae79e8b3f093f6fd 100644 (file)
--- a/tests/data/test151
+++ b/tests/data/test151
@@ -22,7 +22,7 @@ HTTP GET with an error code that might trick authentication
  <command>
 http://%HOSTIP:%HTTPPORT/151
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test152 b/tests/data/test152
index 86ac68d244c272f8fe0778aedf3ff60622b31ec3..aaee6a41b7f63c025588506f710777ea5fefd8f2 100644 (file)
--- a/tests/data/test152
+++ b/tests/data/test152
@@ -22,7 +22,7 @@ HTTP GET with an error code that might trick authentication and --fail
  <command>
 http://%HOSTIP:%HTTPPORT/152 --fail
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test153 b/tests/data/test153
index a2d15191a89a33ce5921e3a633c5a0b87bd0a5fc..8acde6011c072165b5d54c43b8df096693eb6df2 100644 (file)
--- a/tests/data/test153
+++ b/tests/data/test153
@@ -58,7 +58,7 @@ HTTP with Digest authorization with stale=true
  <command>
 http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/1530002
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test159 b/tests/data/test159
index 7ad1c76a875620b5cd1ad41926e53fb1d7995ea3..f8a2e4d0380bab61749733a99fcbc6cf16c53965 100644 (file)
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -56,7 +56,7 @@ HTTP with NTLM authorization when talking HTTP/1.0
  <command>
 http://%HOSTIP:%HTTPPORT/159 -u testuser:testpass --ntlm -0
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test16 b/tests/data/test16
index a6c7d51f0668dfddb89dc6d077b8848ce21c049a..13da705787bdd4651e3c1c9defb63ed66c4dfa7b 100644 (file)
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -23,7 +23,7 @@ HTTP with proxy athorization
  <command>
  -U fake@user:§§§looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HTTPPORT http://we.want.that.site.com/16
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test160 b/tests/data/test160
index 26ef7ec72184038a1d8e38f9b65c8d1f37d6ca55..18f3dece559794890065874e432c2e12d8cd0539 100644 (file)
--- a/tests/data/test160
+++ b/tests/data/test160
@@ -31,7 +31,7 @@ HTTP with delayed close, conn reuse, connection reset and retry
  <command>
 http://%HOSTIP:%HTTPPORT/want/160 http://%HOSTIP:%HTTPPORT/wantmore/1600001
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test161 b/tests/data/test161
index c3bda556f960a7f5f86a6041b416327d723d11e0..81804b00cb1cec5aacf7416f0f687a5a97ea3d98 100644 (file)
--- a/tests/data/test161
+++ b/tests/data/test161
@@ -19,7 +19,7 @@ FTP RETR PASV
  <command>
 ftp://%HOSTIP:%FTPPORT/161
 </command>
-</test>
+</client>
 
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test162 b/tests/data/test162
index a8d55f32635c196ae83addf52ccb5807562d437e..1c9205965d097e86e756c2c41867f9fc5a1ed3d6 100644 (file)
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -27,7 +27,7 @@ HTTP GET asking for --proxy-ntlm when some other authentication is required
  <command>
 http://%HOSTIP:%HTTPPORT/162 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --fail
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test164 b/tests/data/test164
index 366ea415705afa7beef2893838945957790e5011..10d5fd657aa9b8b99329e8b35ec7a1fda3a39af1 100644 (file)
--- a/tests/data/test164
+++ b/tests/data/test164
@@ -41,7 +41,7 @@ HTTP range with multiple ranges
  <command>
 http://%HOSTIP:%HTTPPORT/want/164 -r 0-10,12-15
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test165 b/tests/data/test165
index 0475b69037b653ed3d10e0255a9f103fdf6ae6e0..4945dace53e63d2c18d7e6bbb9b8814f75b7bb26 100644 (file)
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -29,7 +29,7 @@ HTTP over proxy with IDN host name
  <command>
 http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test167 b/tests/data/test167
index 4e57fab4a9f46b9a860ce8c543834bdbb8cdbd52..58ced40617e7a08ee119f28a5da1b0e590c10081 100644 (file)
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -35,7 +35,7 @@ HTTP with proxy-requiring-Basic to site-requiring-Digest
  <command>
 http://data.from.server.requiring.digest.hohoho.com/167 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --digest --user digest:alot
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test168 b/tests/data/test168
index b740a35369b9508440deee73cbc7aa70b1db85f6..80f37ac2585d598d014fb9d5340700a59d3ad0c0 100644 (file)
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -49,7 +49,7 @@ HTTP with proxy-requiring-Digest to site-requiring-Digest
  <command>
 http://data.from.server.requiring.digest.hohoho.com/168 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-digest --digest --user digest:alot
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test169 b/tests/data/test169
index ee3ce8c068887fd893e516a41548235a62d05642..5cfc8b743bfebf4726bca43c792633bc3b3263aa 100644 (file)
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -74,7 +74,7 @@ HTTP with proxy-requiring-NTLM to site-requiring-Digest
  <command>
 http://data.from.server.requiring.digest.hohoho.com/169 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --digest --user digest:alot
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test17 b/tests/data/test17
index de0e2d30344d9a1f7729d955a5aac63e79b0ab8a..52e70634521251c603e6291c7b3099a86fd27a89 100644 (file)
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -31,7 +31,7 @@ request MOOO
  <command>
 -K - %HOSTIP:%HTTPPORT/that.site.com/17
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test170 b/tests/data/test170
index 46012ad4ebc249805bece840c990d586cad697fe..1eb9c8be1e286b0bdb72b99c1a855f7fd5b8172f 100644 (file)
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -16,7 +16,7 @@ HTTP POST with --proxy-ntlm and no SSL with no response
  <command>
 http://a.galaxy.far.far.away/170 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -F "dummy=value"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test174 b/tests/data/test174
index 6f19a76130a36837ad1585989aae771abcfc1163..4b8795bab9c51ccff50e98ead42fd39ca0db1516 100644 (file)
--- a/tests/data/test174
+++ b/tests/data/test174
@@ -22,7 +22,7 @@ HTTP POST --anyauth to server not requiring any auth at all
  <command>
 http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test175 b/tests/data/test175
index 1cf9ac48162165dad1b2603daed7bdc8e5562fe6..e8891926ae6926c68308a6f84e6b95ca42528074 100644 (file)
--- a/tests/data/test175
+++ b/tests/data/test175
@@ -44,7 +44,7 @@ HTTP POST --digest to server not requiring any auth at all
  <command>
 http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test176 b/tests/data/test176
index 5d9cbff44ce7b3536d3e052e1f517ca0f0fa8f35..0a35340d88aa310aad29e3ec25e8f950daf65a03 100644 (file)
--- a/tests/data/test176
+++ b/tests/data/test176
@@ -48,7 +48,7 @@ HTTP POST --ntlm to server not requiring any auth at all
  <command>
 http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test177 b/tests/data/test177
index 9188de0450cdc45bfeaffbcf58440e4399c98d09..2d7d04c80ef81fa0048b9f58e8c5fff273ba782f 100644 (file)
--- a/tests/data/test177
+++ b/tests/data/test177
@@ -21,7 +21,7 @@ HTTP POST --digest to server doing a 302-location response
  <command>
 http://%HOSTIP:%HTTPPORT/177 -u auser:apasswd --digest -d "junkelijunk"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test18 b/tests/data/test18
index 38519b46dbae85521600ff4f07fb7ddd0b93afc4..df1b70361c96d841c62d3aa0a3443f197656069c 100644 (file)
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -34,7 +34,7 @@ multiple requests using {} in URL
  <command>
 '%HOSTIP:%HTTPPORT/{18,180002,180003}'
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test182 b/tests/data/test182
index 5eac8b7089ae7636977423e3fa9420c47239074b..9d13a6a245d8b3d652d49010abacb45da0254a98 100644 (file)
--- a/tests/data/test182
+++ b/tests/data/test182
@@ -18,7 +18,7 @@ FTP download an empty file
 <command>
 ftp://%HOSTIP:%FTPPORT/182
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test183 b/tests/data/test183
index 1278e418de97078cd72f58c1d1a9c80534b2cee2..149eeb44726238ecccb5ca51404552c4018912c1 100644 (file)
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -23,7 +23,7 @@ HTTP GET two URLs over a single proxy with persistent connection
  <command>
 http://deathstar.another.galaxy/183 http://a.galaxy.far.far.away/183 --proxy http://%HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test184 b/tests/data/test184
index 547993f6adf80c6433758bee20ff218504ce5766..3ce1861628b31544738a0ab8d9d7ce559dfd3613 100644 (file)
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -43,7 +43,7 @@ HTTP replace Host: when following Location: to new host
  <command>
 http://deathstar.another.galaxy/184 -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test185 b/tests/data/test185
index 2af7b14253ffc9efbf59a8d28d7be6245dc49df7..890a1abb6fd012b08d66dcae3bcb581415fe9121 100644 (file)
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -43,7 +43,7 @@ HTTP replace Host: when following Location: on the same host
  <command>
 http://deathstar.another.galaxy/185 -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test187 b/tests/data/test187
index dbb86023a2276bf99f827965a73f5afaa103d41b..28405d2ad414b08a66d2d9e328d51bf2e15a6156 100644 (file)
--- a/tests/data/test187
+++ b/tests/data/test187
@@ -45,7 +45,7 @@ HTTP redirect with bad host name separation and slash in parameters
  <command>
 http://%HOSTIP:%HTTPPORT?oh=what-weird=test/187 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test188 b/tests/data/test188
index 43724298fc31a25df523ea1fedba7886922ad1cc..e61cb9d98a9cf8354c9aa68b2cffcd7129706915 100644 (file)
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -42,7 +42,7 @@ HTTP GET with resume and redirect
  <command>
 http://%HOSTIP:%HTTPPORT/188 -C 50 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test189 b/tests/data/test189
index 33d9e406ffee98cbdbac410defb93c5036c22130..5358823302fc9632d8a60d28af95e310dc98b6b3 100644 (file)
--- a/tests/data/test189
+++ b/tests/data/test189
@@ -39,7 +39,7 @@ HTTP GET with resume and redirect (to a page that doesn't resume)
  <command>
 http://%HOSTIP:%HTTPPORT/189 -C 50 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test19 b/tests/data/test19
index 0313ec7de9ce8de0c16098a3ef7674e6c663023b..8aaa2023fbd8b0f8e488773a3db66c1b5deebca9 100644 (file)
--- a/tests/data/test19
+++ b/tests/data/test19
@@ -15,7 +15,7 @@ attempt connect to non-listening socket
  <command>
 %HOSTIP:60000
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test190 b/tests/data/test190
index 3420c9e67f59206fcdc48dd2469fcf4c83defd00..d5c48fb6c77b06a07343e201ce1ac37ebac95d0c 100644 (file)
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -20,7 +20,7 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/126 -m 3
 <file name="log/ftpserver.cmd">
 DELAY CWD 15
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test191 b/tests/data/test191
index c3baf57bcd34bb9df5bc04dce565533829741da6..91bc24526f58a9921dc91a196f14cb9beef024f0 100644 (file)
--- a/tests/data/test191
+++ b/tests/data/test191
@@ -16,7 +16,7 @@ FTP URL with ?-letters in username and password
  <command>
 "ftp://use?r:pass?word@%HOSTIP:%FTPPORT/191"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test195 b/tests/data/test195
index c736e53b3de9ae66136cfc6c5273d762d57cd2d2..39b0744ed9ffd5a482dce67b5566e51038d1f477 100644 (file)
--- a/tests/data/test195
+++ b/tests/data/test195
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/195
 <file name="log/ftpserver.cmd">
 REPLY PASS 530 temporarily not available
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test196 b/tests/data/test196
index 06eeeb5f90160eaf2e4efe629fa0d019d8e0b215..ec43918b0ad5d77cd785d7e42898cdf9b2d6ed05 100644 (file)
--- a/tests/data/test196
+++ b/tests/data/test196
@@ -16,7 +16,7 @@ ftp://%HOSTIP:%FTPPORT/196 --retry 1
 <file name="log/ftpserver.cmd">
 REPLY PASS 530 temporarily not available
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test2 b/tests/data/test2
index 5b7e85052ea8765523145cc26e4471b4ce180994..ecc996a6c2bc735fdee679ce2b8b6870b1dbbed8 100644 (file)
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -23,7 +23,7 @@ HTTP GET with user and password
  <command>
  -u fake:user http://%HOSTIP:%HTTPPORT/2
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test20 b/tests/data/test20
index 0b47595d7f39cb8e0ac5520500ed7fc7cb411dff..5acd69a9339c85c89528b56d77680f117b916df9 100644 (file)
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -15,7 +15,7 @@ attempt connect to non-existing host name
  <command>
 non-existing-and-weeeeeeirdname
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test200 b/tests/data/test200
index a8af499e30737aa2bd04b10c7a59d80c48165873..bd9a448aef709d3d405c9c026cce92c2b5128f80 100644 (file)
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -27,7 +27,7 @@ bar
    foo
 moo
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test201 b/tests/data/test201
index 3e6d937972dc88a0079f0cd83532a52ef91813ab..a2915923e7b7e1173b0db90a902349a25c3d4c93 100644 (file)
--- a/tests/data/test201
+++ b/tests/data/test201
@@ -15,7 +15,7 @@ missing file:// file
  <command>
 file://localhost/%PWD/log/non-existant-file.txt
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test202 b/tests/data/test202
index ef679e07a053b798915584fa63226934422e16a1..937e0beb924b20f98e8aa97cdaebddeb6cf60ab8 100644 (file)
--- a/tests/data/test202
+++ b/tests/data/test202
@@ -18,7 +18,7 @@ file://localhost/%PWD/log/test202.txt file://localhost/%PWD/log/test202.txt
 <file name="log/test202.txt">
 contents in a single file
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test203 b/tests/data/test203
index 051c8a87116f832e019aa2202d2238bfe2dcf7ab..2cec4a69d5f43a573f2f911474161196b1f1f701 100644 (file)
--- a/tests/data/test203
+++ b/tests/data/test203
@@ -27,7 +27,7 @@ bar
    foo
 moo
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test206 b/tests/data/test206
index 7e3c13b0da8889160e23ea3556c3db340edc27db..7bcba288e51c250dbd831b5c2b64465d7c60dab3 100644 (file)
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -58,7 +58,7 @@ HTTP proxy CONNECT auth Digest
  <command>
 http://test.remote.server.com:206/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test207 b/tests/data/test207
index c151d9a78c53167b7b28e61fb24470c4c1f04ea5..f40ecf05ca09eb3f64364abbf4045ad3d5cc3165 100644 (file)
--- a/tests/data/test207
+++ b/tests/data/test207
@@ -33,7 +33,7 @@ HTTP GET with chunked Transfer-Encoding closed pre-maturely
  <command>
 http://%HOSTIP:%HTTPPORT/207
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test208 b/tests/data/test208
index 2f2c52cf0cafb0bcbac10e77d483830d3568e156..2a4669c1394a5ec9b8795f2a9e7059b841f3cc51 100644 (file)
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -32,7 +32,7 @@ the
    PUT
       feature
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test209 b/tests/data/test209
index 5458d64ae4cacf9a50d12315f560274b9d7bf959..5aa6e14aae64fd8562c6efeaf415dc8eb83d519d 100644 (file)
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -72,7 +72,7 @@ HTTP proxy CONNECT auth NTLM
  <command>
 http://test.remote.server.com:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test21 b/tests/data/test21
index cbd22947fb7d436101a53d404df50f77697bd034..2fba375befea0ff3cb2f1a05e2ea3abaabf4e5be 100644 (file)
--- a/tests/data/test21
+++ b/tests/data/test21
@@ -15,7 +15,7 @@ use curl with multiple request methods
  <command>
 -I -d FOOO -F moo=moo localhost
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test213 b/tests/data/test213
index 1dc1e174731ce6b9969fdb47767d782df7e83ea7..64f52cfe48dfcc20265aecc35b8add4f22176f8d 100644 (file)
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -72,7 +72,7 @@ HTTP proxy CONNECT auth NTLM and then POST
  <command>
 http://test.remote.server.com:213/path/2130002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test217 b/tests/data/test217
index 1b0c6a57f02aecf567c5406c4dcf94f1c308320c..82c8b150b9213552beec20e485585f6e3e7cf247 100644 (file)
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -21,7 +21,7 @@ HTTP proxy CONNECT to proxy returning 405
  <command>
 http://test.remote.server.com:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w '%{http_code} %{http_connect}\n'
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test22 b/tests/data/test22
index 3e0f21fdec1dfb812546cf686cd0c4f4fdbbedad..2ffdbc59f433809914b948c1195bacdec6d35446 100644 (file)
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -20,7 +20,7 @@ get HTTP with URL > 10000 bytes
  <command>
 %HOSTIP:%HTTPPORT/`perl -e 'print "a" x 10000;'`/22
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test227 b/tests/data/test227
index 34331d4cf691d23b9827956976b4c4cdecbecf53..bdfe29d75315436a38330c9c609dd1c15ebda76d 100644 (file)
--- a/tests/data/test227
+++ b/tests/data/test227
@@ -21,11 +21,10 @@ FTP with quote ops
  <command>
 ftp://%HOSTIP:%FTPPORT/227 -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3"
 </command>
-</test>
 <file name="log/ftpserver.cmd">
 REPLY EPSV 500 no such command
 </file>
-
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test23 b/tests/data/test23
index f3d860b68bbb61cd6322fb076ce544098142c960..d09d9a71df4d275ed43fd5e0b29f40874b2d916a 100644 (file)
--- a/tests/data/test23
+++ b/tests/data/test23
@@ -15,7 +15,7 @@ unsupported protocol:// URL
  <command>
 htfp://%HOSTIP:%HTTPPORT/none.htfml
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test24 b/tests/data/test24
index b530a234d5e34175db3569f92e6888bd0c1c0ae1..046c0a6727d7c6e49d188449532b58bfcb3eeb17 100644 (file)
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -19,7 +19,7 @@ HTTP GET fail silently on HTTP error return
  <command>
 http://%HOSTIP:%HTTPPORT/24 --fail
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test25 b/tests/data/test25
index 6cf5dc2bd7d9e37f6f3bc981d3ad39ace375ceb2..71e79ac7d503ec9a2ba88366ae9812331b4d3602 100644 (file)
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -60,7 +60,7 @@ looping HTTP Location: following with --max-redirs, no persistance
  <command>
 http://%HOSTIP:%HTTPPORT/want/25 -L --max-redirs 5
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test26 b/tests/data/test26
index 818b2208a0ca2b329c775b847b3994b48e91c390..0959342e5b4f4cb1f815589f49d430d9c5c23e27 100644 (file)
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -20,7 +20,7 @@ specify more -o than URLs
  <command>
 http://%HOSTIP:%HTTPPORT/want/26 -o - -o -
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test27 b/tests/data/test27
index 891b158761330e0a76e622350983def357d18816..06e26a8d0a765304f13bb94d397e01f09bc3a303 100644 (file)
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -20,7 +20,7 @@ Get same cookie page several times
  <command>
 'http://%HOSTIP:%HTTPPORT/want/{27,27,27}' -b none
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test28 b/tests/data/test28
index 9f292351379b18c3b9612210cfab2dddefffc350..6506c10aefc0c0501387dac22248beeb26d1abde 100644 (file)
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -45,7 +45,7 @@ HTTP Location: following with extra spaces in header
  <command>
 http://%HOSTIP:%HTTPPORT/want/28 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test29 b/tests/data/test29
index f5b71436c217d31a1cce33a53ab28652dfdaf9b6..9e47ac396debb2ffda8a1e238052e660b518a315 100644 (file)
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -23,7 +23,7 @@ HTTP with 2 secs timeout
  <command>
 http://%HOSTIP:%HTTPPORT/want/29 -m 2
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test3 b/tests/data/test3
index d0413bf06212d09bad5fd2a8ec8147219a639b94..bf3d01dd601c80d1964652d6f1969360985ea5db 100644 (file)
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -30,7 +30,7 @@ HTTP POST with auth and contents but with content-length set to 0
  <command>
  -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HTTPPORT/3
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test30 b/tests/data/test30
index 6fa623e92980dcc6ebbe723ba4258c0bdcbaca39..80bacc50eff9d51e3cbf08e483d46cdd09fd667e 100644 (file)
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -15,7 +15,7 @@ HTTP with no data in server reply
  <command>
 http://%HOSTIP:%HTTPPORT/want/30
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test300 b/tests/data/test300
index 6ec21c2bd01935f01872978113af042879410d3a..4961b9a164971cc5a61cc816a954ac5dfae45454 100644 (file)
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -23,7 +23,7 @@ simple HTTPS GET
  <command>
 -k https://%HOSTIP:%HTTPSPORT/300
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test301 b/tests/data/test301
index 58c46ecb6f2367849b18ef80fbdf7e40c70312f6..3f156626b1a2a84d42457b31a963ed8ce9437bc1 100644 (file)
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -23,7 +23,7 @@ HTTPS GET with user and password
  <command>
 -k -u fake:user https://%HOSTIP:%HTTPSPORT/301
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test302 b/tests/data/test302
index e8d0413e6dd613ea479ff206155d2e61098a0217..aa3042e9f0f9f99e1f638612e0b423babcf12211 100644 (file)
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -16,7 +16,7 @@ HTTPS GET over HTTP proxy fails
  <command>
 -k -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test/slash/302
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test303 b/tests/data/test303
index b2654a612be0e4a37e9304dab78776f3c5a950d1..ba45255ff9ae32df762504387e3c0e918b305562 100644 (file)
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -23,7 +23,7 @@ HTTPS with 2 secs timeout
  <command>
 http://%HOSTIP:%HTTPPORT/want/303 -m 2
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test304 b/tests/data/test304
index 8aaff245f9842179585ff53f3a79c01af7c83ca1..ed7519072ffb594a92e2abd54d05f620f75b438e 100644 (file)
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -25,7 +25,7 @@ HTTPS multipart formpost
 <file name="log/test304.txt">
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test305 b/tests/data/test305
index 99e5400c8cf18bbca9d8617fe7866e180c4d097d..a2b07f874685cb452f10c4cdf81288ba3940f157 100644 (file)
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -15,7 +15,7 @@ insecure HTTPS without permission
  <command>
 https://%HOSTIP:%HTTPPORT/want/305 --cacert moooo
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test306 b/tests/data/test306
index 646eee4d2d91b397ef54c126c92b8eea3044c5bf..81c524371d6ccd1c4063b3271690e879b4736662 100644 (file)
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -36,7 +36,7 @@ HTTPS GET, receive no headers only data!
  <command>
 -k https://%HOSTIP:%HTTPSPORT/306
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test31 b/tests/data/test31
index ac2e4e59eafe9c06b394d112079fe2a2814b177d..2433ba34b062f47d8b8f13af179f586f97cdb94f 100644 (file)
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -33,7 +33,7 @@ HTTP with weirdly formatted cookies and cookiejar storage
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test33 b/tests/data/test33
index bc8c9d93b3e5128402f29b75900a485cb40d75ab..804e3c9862915e584261bf5a021a1a8486b63a97 100644 (file)
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -29,7 +29,7 @@ HTTP PUT with resume
  <command>
 http://%HOSTIP:%HTTPPORT/33 -Tlog/test33.txt -C 50
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test34 b/tests/data/test34
index 4d646cdd290c6c10a7f0375bf280f32410d5d2bc..9cef0bdec89b34e300342bf15b0a03be441bb158 100644 (file)
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -39,7 +39,7 @@ HTTP GET with chunked Transfer-Encoding
  <command>
 http://%HOSTIP:%HTTPPORT/34
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test36 b/tests/data/test36
index 406b9218fcd37bdd96b6ab568015879925c543b6..1ec85e6cf0911b46b4b29675129600538fae5369 100644 (file)
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -35,7 +35,7 @@ HTTP GET with bad chunked Transfer-Encoding
  <command>
 http://%HOSTIP:%HTTPPORT/36
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test37 b/tests/data/test37
index 889d6aacb22940fc142e118c1ea1541a91c00cd7..a374eb1628de072d0bd92664c95a6bfa62348396 100644 (file)
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -17,7 +17,7 @@ HTTP GET with nothing returned from server
  <command>
 http://%HOSTIP:%HTTPPORT/37
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test39 b/tests/data/test39
index 15f9e9358e661aad4d0f13f9ba3f11e4dfb3512b..29f6cc398baba82fca004d824399ad48f03ce1aa 100644 (file)
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -28,7 +28,7 @@ This is a bar foo
 bar
 foo
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test4 b/tests/data/test4
index 37b081f1cc6299a33e63fb6f4d67621b8d3eb9ee..65f3ba0901c1c257ba276468df106e827d32a9a1 100644 (file)
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -23,7 +23,7 @@ Replaced internal and added custom HTTP headers
  <command>
  -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HTTPPORT/4
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test41 b/tests/data/test41
index d8cb36da690dfc933cfb06ed0b27c0cefc22ef00..84cb2cff1bc2f33ffb2b5b5d59507c01cc72b46e 100644 (file)
--- a/tests/data/test41
+++ b/tests/data/test41
@@ -13,7 +13,7 @@ HTTP formpost with missing file
  <command>
 http://%HOSTIP:%HTTPPORT/want/41 -F moo=@boo
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test43 b/tests/data/test43
index d03772fce96da1192889b12f4b79cee0e3948b59..6d2ce7ddcaeb83afff5992397b3bcf1945cd144c 100644 (file)
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -45,7 +45,7 @@ HTTP Location: following over HTTP proxy
  <command>
 http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test44 b/tests/data/test44
index e858786da926dfe48f7661347971485ee3270f8e..b4394182badf4379c26f2f83599eb041219be46c 100644 (file)
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -27,7 +27,7 @@ foo-
 This is a moo-
 bar
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test45 b/tests/data/test45
index 30a1fea8a87040c748cb33defddb01f6a8c95551..7645bc77d1548565868758568e8671bfebbedfd4 100644 (file)
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -45,7 +45,7 @@ simple HTTP Location: without protocol in initial URL
  <command>
 %HOSTIP:%HTTPPORT/want/45 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test47 b/tests/data/test47
index a3e53cd14dfea3d2d4b5fcdf1c8e22d15e745eb8..5118ff6d55233b3cc9651ae28f418de7bf7853c1 100644 (file)
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -22,7 +22,7 @@ simple HTTP 1.0 GET
  <command>
 http://%HOSTIP:%HTTPPORT/47 -0
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test5 b/tests/data/test5
index 2d2d76f7c49f4b291100e805181b6734d2fb0b6e..0a3d21f3a563167bfdd43835fa8ae2effa0f2286 100644 (file)
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -23,7 +23,7 @@ HTTP over proxy
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/5 -x %HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test54 b/tests/data/test54
index 076311d74cac27e28b96638f77091a73d511f393..1df072d06e03b6cf2cb09f80fcb514cd04fabfcf 100644 (file)
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -20,7 +20,7 @@ HTTP with blank Location:
  <command>
 http://%HOSTIP:%HTTPPORT/want/54 -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test56 b/tests/data/test56
index 098e1e10acbbe653a9a9856441035a595fe1c0ae..33c276f0cdb4ee270e0afc646e9293f4381bb6c9 100644 (file)
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -30,7 +30,7 @@ header "Transfer-Encoding: chunked"
  <command>
 -K - %HOSTIP:%HTTPPORT/that.site.com/56
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test6 b/tests/data/test6
index 910d41fcfcd7f0e0c66a5739b280cdc2ce247e17..662b847a6e098074fc40c814ebf6b9b687a30107 100644 (file)
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -22,7 +22,7 @@ HTTP with simple cookie send
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/6 -b "name=contents;name2=content2"
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test63 b/tests/data/test63
index 0c2a78b2b839137fc2d2126a77480ecdccdd0112..06a7289da480f81b11b9a4eaab31b32803a6cb5b 100644 (file)
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -23,7 +23,7 @@ http_proxy=http://fake:user@%HOSTIP:%HTTPPORT/
  <command>
 http://we.want.that.site.com/63
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test64 b/tests/data/test64
index 87acbb6821f96d169b38045280de004d26693639..d596575d70be2aec17aa420816da683226eb5e55 100644 (file)
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -45,7 +45,7 @@ HTTP with Digest authorization
  <command>
 http://%HOSTIP:%HTTPPORT/64 -u testuser:testpass --digest
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test65 b/tests/data/test65
index b32e777867fc81536b42d73ad22e80e92174328c..0b366f9bf748480b57d647f3f9a4e0624f2edcd9 100644 (file)
--- a/tests/data/test65
+++ b/tests/data/test65
@@ -49,7 +49,7 @@ HTTP with Digest authorization with bad password
  <command>
 http://%HOSTIP:%HTTPPORT/65 -u testuser:test2pass --digest
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test67 b/tests/data/test67
index e2fd51cf2eb2b725195eb8a331f61f3c33dfbac2..9462ca8bbcdc0d9129eaeb907f766d6b96fceba1 100644 (file)
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -56,7 +56,7 @@ HTTP with NTLM authorization
  <command>
 http://%HOSTIP:%HTTPPORT/67 -u testuser:testpass --ntlm
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test68 b/tests/data/test68
index c4f4eec398ae10bfd4bf0ae086d1c2c2e2b613bd..e45b278a269a0afa2bba6c0c9e24d79b43e97752 100644 (file)
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -58,7 +58,7 @@ HTTP with NTLM authorization and wrong password
  <command>
 http://%HOSTIP:%HTTPPORT/68 -u testuser:testpass --ntlm
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test69 b/tests/data/test69
index 5fe3625e1b1507cb77be2db1f020da442d614b52..2ea9c7fdbdf3eea4973f7337be14b6ce8d263d6c 100644 (file)
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -71,7 +71,7 @@ HTTP with NTLM, Basic or Wild-and-crazy authorization
  <command>
 http://%HOSTIP:%HTTPPORT/69 -u testuser:testpass --anyauth
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test7 b/tests/data/test7
index ad526e132e9ab0847ff93be4c78a6ca8a926e532..0cbeee6f3134d0278efe687821e2b45d5bae31f8 100644 (file)
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -24,7 +24,7 @@ HTTP with cookie parser and header recording
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/7 -b none -D log/heads7.txt
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test70 b/tests/data/test70
index 1b73d948f8643359055baaf44f1748cb4175e2f4..9ca829c68d15450f939aa1418b621cd85430134c 100644 (file)
--- a/tests/data/test70
+++ b/tests/data/test70
@@ -55,7 +55,7 @@ HTTP with Digest *OR* NTLM authorization
  <command>
 http://%HOSTIP:%HTTPPORT/70 -u testuser:testpass --anyauth
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test71 b/tests/data/test71
index e18917b956ced52ee2860a947ec6368095b76119..756fcabcbfa8c3543274064117b82e40001c56dd 100644 (file)
--- a/tests/data/test71
+++ b/tests/data/test71
@@ -32,7 +32,7 @@ foo-
 This is a moo-
 bar
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test72 b/tests/data/test72
index f480840d6a7993d35074540a3442337dd3007e94..9a649f726fbdd90d90aa01125fb4ae4c1f9de401 100644 (file)
--- a/tests/data/test72
+++ b/tests/data/test72
@@ -51,7 +51,7 @@ HTTP with Digest *OR* Basic authorization
  <command>
 http://%HOSTIP:%HTTPPORT/72 -u testuser:testpass --anyauth
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test79 b/tests/data/test79
index b13c1ed3b378f8dfead84a59f37a52932adac7e5..cc449c4db4ea7374a44c20037094b9b08713c244 100644 (file)
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -24,7 +24,7 @@ FTP over HTTP proxy
  <command>
 ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test8 b/tests/data/test8
index 4ca750da7ce8e61ed8d8a02d772f29a40b365671..422e3664286a0a806702cef3962d25a33efeae74 100644 (file)
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -32,7 +32,7 @@ Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
 Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
 
 </file>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test80 b/tests/data/test80
index 0f274b2525c8e1983135e453b1e2c1e801b434ca..619d16d481578a71b6808c96f9d6849131b09003 100644 (file)
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -35,7 +35,7 @@ HTTP CONNECT with proxy and host Basic authentication
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/80 -p -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user youare:yourself
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test81 b/tests/data/test81
index 69379b72fe24d14b6f086f4448dc019ba9401be9..7107392a4a582dc27d3c995d4a6ccd399f6b398d 100644 (file)
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -54,7 +54,7 @@ HTTP with proxy using NTLM authorization
  <command>
 http://%HOSTIP:%HTTPPORT/81 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT --proxy-ntlm
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test82 b/tests/data/test82
index 12d10078c67946890bd21b5422f58e044e3e4880..f6e5e86252804c00af80b4e7fa6525e15342be4c 100644 (file)
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -26,7 +26,7 @@ HTTP with proxy requiring NTLM, but we send Basic
  <command>
 http://%HOSTIP:%HTTPPORT/82 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test83 b/tests/data/test83
index 88b52d3f5224d8102170911373137941a3eafdc4..02979342d8bd82fe71aa0091953b20f4121bc71b 100644 (file)
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -35,7 +35,7 @@ HTTP over proxy-tunnel with site authentication
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/83 -p -x %HOSTIP:%HTTPPORT --user iam:myself
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test84 b/tests/data/test84
index 89a6697a6cc5488f6889d55757c499bcbbbdf7f8..d62c5db46e41cb7e70212485cecf7113437b53a9 100644 (file)
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -24,7 +24,7 @@ HTTP over proxy with site authentication
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/84 -x %HOSTIP:%HTTPPORT --user iam:myself
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test85 b/tests/data/test85
index 399b3a2efdb9dffef9354801c1e17c3fcf6ac963..c775e802b4008eb85336e3df48d75f94b5c1adcd 100644 (file)
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -24,7 +24,7 @@ HTTP over proxy with site and proxy authentication
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/85 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test89 b/tests/data/test89
index 5b5b3d27e140e67f7ae298de52672b28e4fcf784..be965f710a1a5ff2ac627d9c997670d447a1f997 100644 (file)
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -88,7 +88,7 @@ HTTP with NTLM and follow-location
  <command>
 http://%HOSTIP:%HTTPPORT/89 -u testuser:testpass --ntlm -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test90 b/tests/data/test90
index 6c3475a0613441c7ee2f2b1bacae950aebeb2bc4..50e58b6cc5844e795c8044ba7402bad0c4a0d0db 100644 (file)
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -122,7 +122,7 @@ HTTP with NTLM via --anyauth, and then follow-location with NTLM again
  <command>
 http://%HOSTIP:%HTTPPORT/90 -u testuser:testpass --anyauth -L
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test91 b/tests/data/test91
index f571e7c0dc4a0e2c453e79245bd086293e1eb778..3232744e865a4e41ac2ae1ce2e60e2b076744c99 100644 (file)
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -74,7 +74,7 @@ HTTP with NTLM/Negotiate/Basic, anyauth and user with domain, with size 0
  <command>
 http://%HOSTIP:%HTTPPORT/91 --anyauth -u mydomain\\myself:secret
 </command>
-</test>
+</client>
 
 # Verify data after the test has been "shot"
 <verify>

diff --git a/tests/data/test95 b/tests/data/test95
index 22b4416bea8777c4df4dcc6f94c0305fb6da12f1..334a21cb2107a6764f7ad7b703c1b1f1257bfa06 100644 (file)
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -35,7 +35,7 @@ HTTP over proxytunnel using POST
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%HTTPPORT -d "datatopost=ohthatsfunyesyes"
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/data/test97 b/tests/data/test97
index e3673b984c6f64ef32ecfa709b9a48939f073492..040462941ee9f45f13a8b2d7f31c8cd3e87e1dd0 100644 (file)
--- a/tests/data/test97
+++ b/tests/data/test97
@@ -23,7 +23,7 @@ HTTP POST with custom content-type
  <command>
  -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HTTPPORT/97
 </command>
-</test>
+</client>
 
 #
 # Verify data after the test has been "shot"

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 866090888cd5183b0a2fe2b1f4f5f4063fbd5f1c..422c43097767a66ab6658d6c6dc4dcbbb2262913 100644 (file)
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -125,6 +125,7 @@ my %commandok = (
                  'STOR' => 'twosock',
                  'APPE' => 'twosock',
                  'REST' => 'twosock',
+                 'ACCT' => 'loggedin',
                  'CWD'  => 'loggedin|twosock',
                  'SYST' => 'loggedin',
                  'SIZE' => 'loggedin|twosock',