A minor "syntax error" in numerous test files corrected

2024-12-21 15:48:49 -05:00 · 2005-01-25 21:45:03 +00:00 · 2005-01-25 21:45:03 +00:00 · f2e71edcbd
commit f2e71edcbd
parent fad6e5a5bc
158 changed files with 158 additions and 160 deletions
--- 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>
--- a/tests/data/test100
+++ b/tests/data/test100
@ -1,6 +1,6 @@
 #
 # Server-side
-<reply name="1">
+<reply>
 <data>
 total 20
 drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
@ -28,7 +28,7 @@ FTP dir list PASV
 <command>
 ftp://%HOSTIP:%FTPPORT/
 </command>
-</test>
+</client>

 #
 # Verify data after the test has been "shot"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- a/Show More
+++ b/Show More