summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/data/test1003
-rw-r--r--tests/data/test1026
-rw-r--r--tests/data/test1058
-rw-r--r--tests/data/test1092
-rw-r--r--tests/data/test1108
-rw-r--r--tests/data/test1112
-rw-r--r--tests/data/test1122
-rw-r--r--tests/data/test1136
-rw-r--r--tests/data/test1146
-rw-r--r--tests/data/test1158
-rw-r--r--tests/data/test1166
-rw-r--r--tests/data/test1178
-rw-r--r--tests/data/test1188
-rw-r--r--tests/data/test1196
-rw-r--r--tests/data/test1206
-rw-r--r--tests/data/test1226
-rw-r--r--tests/data/test1248
-rw-r--r--tests/data/test1256
-rw-r--r--tests/data/test1266
-rw-r--r--tests/data/test1303
-rw-r--r--tests/data/test1313
-rw-r--r--tests/data/test1323
-rw-r--r--tests/data/test1333
-rw-r--r--tests/data/test1343
-rw-r--r--tests/data/test1376
-rw-r--r--tests/data/test1386
-rw-r--r--tests/data/test1446
-rw-r--r--tests/data/test1456
-rw-r--r--tests/data/test1478
-rw-r--r--tests/data/test1488
-rw-r--r--tests/data/test1907
-rw-r--r--tests/data/test1956
-rw-r--r--tests/data/test1966
-rw-r--r--tests/data/test2116
-rw-r--r--tests/data/test2126
-rw-r--r--tests/data/test2276
-rw-r--r--tests/data/test2288
-rw-r--r--tests/data/test2298
-rw-r--r--tests/data/test2352
-rw-r--r--tests/data/test23618
-rw-r--r--tests/data/test2376
-rw-r--r--tests/data/test2388
-rw-r--r--tests/data/test2503
-rw-r--r--tests/data/test2523
-rw-r--r--tests/data/test2543
-rw-r--r--tests/data/test2613
-rw-r--r--tests/data/test2803
-rw-r--r--tests/data/test2902
-rw-r--r--tests/data/test30210
-rw-r--r--tests/data/test3058
-rw-r--r--tests/data/test4003
-rw-r--r--tests/data/test4022
-rw-r--r--tests/data/test5118
-rw-r--r--tests/data/test5206
-rw-r--r--tests/data/test5213
-rw-r--r--tests/data/test5262
-rw-r--r--tests/data/test5272
-rw-r--r--tests/data/test5282
-rw-r--r--tests/data/test5302
-rw-r--r--tests/data/test5322
-rw-r--r--tests/data/test5332
-rw-r--r--tests/data/test5342
-rw-r--r--tests/data/test5387
63 files changed, 127 insertions, 204 deletions
diff --git a/tests/data/test100 b/tests/data/test100
index e27b05b4e..6127163b2 100644
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test102 b/tests/data/test102
index 692a4f6cd..141bc0f35 100644
--- a/tests/data/test102
+++ b/tests/data/test102
@@ -16,6 +16,9 @@ that FTP
works
so does it?
</data>
+<servercmd>
+REPLY EPSV 500 no such command
+</servercmd>
</reply>
# Client-side
@@ -30,9 +33,6 @@ FTP RETR PASV
ftp://%HOSTIP:%FTPPORT/102
</command>
-<file name="log/ftpserver.cmd">
-REPLY EPSV 500 no such command
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test105 b/tests/data/test105
index d3a0a4f2d..cab24f71d 100644
--- a/tests/data/test105
+++ b/tests/data/test105
@@ -17,6 +17,10 @@ that FTP
works
so does it?
</data>
+<servercmd>
+REPLY EPSV 500 no such command
+REPLY SIZE 500 no such command
+</servercmd>
</reply>
# Client-side
@@ -30,10 +34,6 @@ FTP user+password in URL and ASCII transfer
<command>
ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii
</command>
-<file name="log/ftpserver.cmd">
-REPLY EPSV 500 no such command
-REPLY SIZE 500 no such command
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test109 b/tests/data/test109
index b2e80654d..c027885b1 100644
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -31,8 +31,6 @@ Moooooooooooo
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test110 b/tests/data/test110
index 2b6f42f86..b63ba8a2d 100644
--- a/tests/data/test110
+++ b/tests/data/test110
@@ -16,6 +16,9 @@ but we emulate that
<size>
85
</size>
+<servercmd>
+REPLY EPSV 500 no such command
+</servercmd>
</reply>
# Client-side
@@ -29,15 +32,10 @@ FTP download resume with set limit
<command>
ftp://%HOSTIP:%FTPPORT/110 -C 20
</command>
-<file name="log/ftpserver.cmd">
-REPLY EPSV 500 no such command
-</file>
</client>
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test111 b/tests/data/test111
index ee81fc6fa..bcaa55425 100644
--- a/tests/data/test111
+++ b/tests/data/test111
@@ -32,8 +32,6 @@ ftp://%HOSTIP:%FTPPORT/111 -C 2000
<errorcode>
36
</errorcode>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test112 b/tests/data/test112
index 6e4b20c09..eb3400c57 100644
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -31,8 +31,6 @@ worx?
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test113 b/tests/data/test113
index 39d200e52..0046297cf 100644
--- a/tests/data/test113
+++ b/tests/data/test113
@@ -7,6 +7,9 @@ FAILURE
</info>
# Server-side
<reply>
+<servercmd>
+REPLY USER 314 bluah you fewl!
+</servercmd>
</reply>
# Client-side
@@ -20,9 +23,6 @@ FTP download, failed login: USER not valid
<command>
ftp://%HOSTIP:%FTPPORT/113
</command>
-<file name="log/ftpserver.cmd">
-REPLY USER 314 bluah you fewl!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test114 b/tests/data/test114
index 70f1f6ad6..6611aedeb 100644
--- a/tests/data/test114
+++ b/tests/data/test114
@@ -7,6 +7,9 @@ FAILURE
</info>
# Server-side
<reply>
+<servercmd>
+REPLY PASS 314 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -20,9 +23,6 @@ FTP download, failed login: PASS not valid
<command>
ftp://%HOSTIP:%FTPPORT/114
</command>
-<file name="log/ftpserver.cmd">
-REPLY PASS 314 bluah you f00l!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test115 b/tests/data/test115
index d4df5ebcc..f37a7e9fd 100644
--- a/tests/data/test115
+++ b/tests/data/test115
@@ -8,6 +8,10 @@ FAILURE
</info>
# Server-side
<reply>
+<servercmd>
+REPLY PASV 314 bluah you f00l!
+REPLY EPSV 314 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -21,10 +25,6 @@ FTP download, failed PASV
<command>
ftp://%HOSTIP:%FTPPORT/115
</command>
-<file name="log/ftpserver.cmd">
-REPLY PASV 314 bluah you f00l!
-REPLY EPSV 314 bluah you f00l!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test116 b/tests/data/test116
index e049e6f43..d3718e393 100644
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -8,6 +8,9 @@ FAILURE
</info>
# Server-side
<reply>
+<servercmd>
+REPLY PORT 314 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -21,9 +24,6 @@ FTP download, failed PORT
<command>
ftp://%HOSTIP:%FTPPORT/116 -P 127.0.0.1
</command>
-<file name="log/ftpserver.cmd">
-REPLY PORT 314 bluah you f00l!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test117 b/tests/data/test117
index 35c7a1833..2caad0da5 100644
--- a/tests/data/test117
+++ b/tests/data/test117
@@ -7,6 +7,10 @@ FAILURE
</info>
# Server-side
<reply>
+<servercmd>
+REPLY EPSV 314 bluah you f00l!
+REPLY TYPE 314 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -20,10 +24,6 @@ FTP download, failed TYPE
<command>
ftp://%HOSTIP:%FTPPORT/117
</command>
-<file name="log/ftpserver.cmd">
-REPLY EPSV 314 bluah you f00l!
-REPLY TYPE 314 bluah you f00l!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test118 b/tests/data/test118
index f8f6dd114..6cd086ca2 100644
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -9,6 +9,10 @@ FAILURE
</info>
# Server-side
<reply>
+<servercmd>
+REPLY RETR 314 bluah you f00l!
+REPLY EPSV 314 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -22,10 +26,6 @@ FTP download, failed RETR
<command>
ftp://%HOSTIP:%FTPPORT/118
</command>
-<file name="log/ftpserver.cmd">
-REPLY RETR 314 bluah you f00l!
-REPLY EPSV 314 bluah you f00l!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test119 b/tests/data/test119
index 8c13960dd..0db6d297c 100644
--- a/tests/data/test119
+++ b/tests/data/test119
@@ -9,6 +9,9 @@ FAILURE
</info>
# Server-side
<reply>
+<servercmd>
+REPLY RETR 314 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -22,9 +25,6 @@ FTP download, failed RETR with PORT
<command>
ftp://%HOSTIP:%FTPPORT/119 -P -
</command>
-<file name="log/ftpserver.cmd">
-REPLY RETR 314 bluah you f00l!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test120 b/tests/data/test120
index 2e50fabd7..85d49f529 100644
--- a/tests/data/test120
+++ b/tests/data/test120
@@ -17,6 +17,9 @@ that FTP
works
so does it?
</data>
+<servercmd>
+REPLY EPSV 314 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -30,9 +33,6 @@ ftp download with post-quote delete operation
<command>
ftp://%HOSTIP:%FTPPORT/120 -Q "-DELE file"
</command>
-<file name="log/ftpserver.cmd">
-REPLY EPSV 314 bluah you f00l!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test122 b/tests/data/test122
index 276068741..fb1dd05fc 100644
--- a/tests/data/test122
+++ b/tests/data/test122
@@ -11,6 +11,9 @@ Resume
<size>
5
</size>
+<servercmd>
+REPLY EPSV 500 no such command
+</servercmd>
</reply>
# Client-side
@@ -24,9 +27,6 @@ FTP download resume with whole file already downloaded
<command>
ftp://%HOSTIP:%FTPPORT/122 -C 5
</command>
-<file name="log/ftpserver.cmd">
-REPLY EPSV 500 no such command
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test124 b/tests/data/test124
index 6e01dba38..255d8731f 100644
--- a/tests/data/test124
+++ b/tests/data/test124
@@ -11,6 +11,10 @@ RETR
<data>
we can still send data even if pwd fails!
</data>
+<servercmd>
+REPLY PWD 314 bluah you f00l!
+REPLY EPSV 314 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -24,10 +28,6 @@ FTP download, failed PWD
<command>
ftp://%HOSTIP:%FTPPORT/124
</command>
-<file name="log/ftpserver.cmd">
-REPLY PWD 314 bluah you f00l!
-REPLY EPSV 314 bluah you f00l!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test125 b/tests/data/test125
index d9b6205d6..5677aeb47 100644
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -7,6 +7,9 @@ FAILURE
</info>
# Server-side
<reply>
+<servercmd>
+REPLY CWD 314 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -20,9 +23,6 @@ FTP download, failed CWD
<command>
ftp://%HOSTIP:%FTPPORT/path/to/file/125
</command>
-<file name="log/ftpserver.cmd">
-REPLY CWD 314 bluah you f00l!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test126 b/tests/data/test126
index 92ae37bb2..0872214af 100644
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -12,6 +12,9 @@ RETRWEIRDO
<data>
this is file contents
</data>
+<servercmd>
+RETRWEIRDO
+</servercmd>
</reply>
# Client-side
@@ -25,9 +28,6 @@ FTP download with multiple replies at once in RETR
<command>
ftp://%HOSTIP:%FTPPORT/blalbla/lululul/126
</command>
-<file name="log/ftpserver.cmd">
-RETRWEIRDO
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test130 b/tests/data/test130
index c1e9cd998..43ab24c09 100644
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -52,9 +52,6 @@ machine %HOSTIP login user2 password passwd2
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER user1
PASS passwd1
diff --git a/tests/data/test131 b/tests/data/test131
index d14bea47c..5f9eb6ac1 100644
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -53,9 +53,6 @@ machine %HOSTIP login user2 password passwd2
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER user2
PASS passwd2
diff --git a/tests/data/test132 b/tests/data/test132
index c03e8ed41..2ff39fb9a 100644
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -52,9 +52,6 @@ machine %HOSTIP login user2 password passwd2
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER mary
PASS mark
diff --git a/tests/data/test133 b/tests/data/test133
index 6016a64f1..2e6b2c3a4 100644
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -52,9 +52,6 @@ machine %HOSTIP login user2 password passwd2
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER user1
PASS passwd1
diff --git a/tests/data/test134 b/tests/data/test134
index a18cbaa55..8ff9c1902 100644
--- a/tests/data/test134
+++ b/tests/data/test134
@@ -52,9 +52,6 @@ machine %HOSTIP login user2 password passwd2
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER romulus
PASS rhemus
diff --git a/tests/data/test137 b/tests/data/test137
index 75dbe6af7..11068cbd8 100644
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -4,6 +4,9 @@
<data>
this is file contents
</data>
+<servercmd>
+RETRNOSIZE
+</servercmd>
</reply>
# Client-side
@@ -17,9 +20,6 @@ FTP download without size in RETR string
<command>
ftp://%HOSTIP:%FTPPORT/blalbla/lululul/137
</command>
-<file name="log/ftpserver.cmd">
-RETRNOSIZE
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test138 b/tests/data/test138
index 6c8ecd5b2..e0de7d22b 100644
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -7,6 +7,9 @@ this is file contents
<size>
-1
</size>
+<servercmd>
+RETRNOSIZE
+</servercmd>
</reply>
# Client-side
@@ -20,9 +23,6 @@ FTP download without size in RETR string and no SIZE command
<command>
ftp://%HOSTIP:%FTPPORT/blalbla/lululul/138
</command>
-<file name="log/ftpserver.cmd">
-RETRNOSIZE
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test144 b/tests/data/test144
index eec3b3731..4a9f0038e 100644
--- a/tests/data/test144
+++ b/tests/data/test144
@@ -3,6 +3,9 @@
<reply>
<data>
</data>
+<servercmd>
+REPLY NLST 450 No files found
+</servercmd>
</reply>
# Client-side
@@ -16,9 +19,6 @@ FTP NLST dir list without contents, using PORT
<command>
ftp://%HOSTIP:%FTPPORT/ -P - -l
</command>
-<file name="log/ftpserver.cmd">
-REPLY NLST 450 No files found
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test145 b/tests/data/test145
index 708c67264..931d52745 100644
--- a/tests/data/test145
+++ b/tests/data/test145
@@ -1,6 +1,9 @@
<testcase>
# Server-side
<reply>
+<servercmd>
+REPLY NLST 550 Have a taste on this!
+</servercmd>
<data>
</data>
</reply>
@@ -16,9 +19,6 @@ FTP NLST dir list with weird reply code, using PORT
<command>
ftp://%HOSTIP:%FTPPORT/ -P - -l
</command>
-<file name="log/ftpserver.cmd">
-REPLY NLST 550 Have a taste on this!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test147 b/tests/data/test147
index 48a3e9fa0..9d2b27aea 100644
--- a/tests/data/test147
+++ b/tests/data/test147
@@ -4,6 +4,10 @@
<data>
foo
</data>
+<servercmd>
+REPLY CWD 550 I won't allow this on my server
+COUNT CWD 1
+</servercmd>
</reply>
# Client-side
@@ -17,10 +21,6 @@ FTP with --ftp-create-dirs (failing CWD)
<command>
ftp://%HOSTIP:%FTPPORT/first/dir/here/147 --ftp-create-dirs
</command>
-<file name="log/ftpserver.cmd">
-REPLY CWD 550 I won't allow this on my server
-COUNT CWD 1
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test148 b/tests/data/test148
index 50a651d9c..ace4b4d4e 100644
--- a/tests/data/test148
+++ b/tests/data/test148
@@ -1,6 +1,10 @@
<testcase>
# Server-side
<reply>
+<servercmd>
+REPLY CWD 550 I won't allow this on my server
+REPLY MKD 550 We will have no such thing
+</servercmd>
</reply>
# Client-side
@@ -14,10 +18,6 @@ FTP with --ftp-create-dirs (failing MKD)
<command>
ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/148 --ftp-create-dirs
</command>
-<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
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test190 b/tests/data/test190
index 4ac85af4a..722ef365d 100644
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -1,7 +1,9 @@
<testcase>
# Server-side
<reply>
-moooooooo
+<servercmd>
+DELAY CWD 60
+</servercmd>
</reply>
# Client-side
@@ -18,9 +20,6 @@ FTP download with strict timeout and slow CWD
<command>
ftp://%HOSTIP:%FTPPORT/path/to/file/190 -m %FTPTIME2
</command>
-<file name="log/ftpserver.cmd">
-DELAY CWD 60
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test195 b/tests/data/test195
index 556b08ee4..788c89a02 100644
--- a/tests/data/test195
+++ b/tests/data/test195
@@ -1,6 +1,9 @@
<testcase>
# Server-side
<reply>
+<servercmd>
+REPLY PASS 530 temporarily not available
+</servercmd>
</reply>
# Client-side
@@ -14,9 +17,6 @@ FTP response 530 after PASS, temporarily not allowed access
<command>
ftp://%HOSTIP:%FTPPORT/195
</command>
-<file name="log/ftpserver.cmd">
-REPLY PASS 530 temporarily not available
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test196 b/tests/data/test196
index 6c84bd818..663eaf2e0 100644
--- a/tests/data/test196
+++ b/tests/data/test196
@@ -1,6 +1,9 @@
<testcase>
# Server-side
<reply>
+<servercmd>
+REPLY PASS 530 temporarily not available
+</servercmd>
</reply>
# Client-side
@@ -14,9 +17,6 @@ FTP transient error, retry request once
<command>
ftp://%HOSTIP:%FTPPORT/196 --retry 1
</command>
-<file name="log/ftpserver.cmd">
-REPLY PASS 530 temporarily not available
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test211 b/tests/data/test211
index 72252a863..0214effc8 100644
--- a/tests/data/test211
+++ b/tests/data/test211
@@ -4,6 +4,9 @@
<data>
data blobb
</data>
+<servercmd>
+REPLY EPSV 500 no such command
+</servercmd>
</reply>
# Client-side
@@ -17,9 +20,6 @@ Get two FTP files with no remote EPSV support
<command>
ftp://%HOSTIP:%FTPPORT/a/path/211 ftp://%HOSTIP:%FTPPORT/a/path/211
</command>
-<file name="log/ftpserver.cmd">
-REPLY EPSV 500 no such command
-</file>
<stdout>
data blobb
data blobb
diff --git a/tests/data/test212 b/tests/data/test212
index 655a32f38..d00e677d7 100644
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -4,6 +4,9 @@
<data>
data blobb
</data>
+<servercmd>
+REPLY EPRT 500 no such command
+</servercmd>
</reply>
# Client-side
@@ -20,9 +23,6 @@ Get two FTP files with no remote EPRT support
<command>
ftp://%HOSTIP:%FTPPORT/a/path/212 ftp://%HOSTIP:%FTPPORT/a/path/212 -P -
</command>
-<file name="log/ftpserver.cmd">
-REPLY EPRT 500 no such command
-</file>
<stdout>
data blobb
data blobb
diff --git a/tests/data/test227 b/tests/data/test227
index d6cac8d47..6f8f86121 100644
--- a/tests/data/test227
+++ b/tests/data/test227
@@ -18,6 +18,9 @@ that FTP
works
so does it?
</data>
+<servercmd>
+REPLY EPSV 500 no such command
+</servercmd>
</reply>
# Client-side
@@ -31,9 +34,6 @@ FTP with quote ops
<command>
ftp://%HOSTIP:%FTPPORT/227 -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3"
</command>
-<file name="log/ftpserver.cmd">
-REPLY EPSV 500 no such command
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test228 b/tests/data/test228
index 0c4e0a069..4a4a295c4 100644
--- a/tests/data/test228
+++ b/tests/data/test228
@@ -16,6 +16,10 @@ that FTP
works
so does it?
</data>
+<servercmd>
+REPLY PASS 332 please provide account name
+REPLY ACCT 230 thank you
+</servercmd>
</reply>
# Client-side
@@ -29,10 +33,6 @@ FTP RETR with ACCT
<command>
ftp://%HOSTIP:%FTPPORT/228 --ftp-account "one count"
</command>
-<file name="log/ftpserver.cmd">
-REPLY PASS 332 please provide account name
-REPLY ACCT 230 thank you
-</file>
</client>
diff --git a/tests/data/test229 b/tests/data/test229
index f036f245c..dffcc1110 100644
--- a/tests/data/test229
+++ b/tests/data/test229
@@ -9,6 +9,10 @@ compressed
</info>
# Server-side
<reply>
+<servercmd>
+REPLY PASS 332 please provide account name
+REPLY ACCT 532 bluah!
+</servercmd>
</reply>
# Client-side
@@ -22,10 +26,6 @@ FTP RETR with bad ACCT
<command>
ftp://%HOSTIP:%FTPPORT/229 --ftp-account "one count"
</command>
-<file name="log/ftpserver.cmd">
-REPLY PASS 332 please provide account name
-REPLY ACCT 532 bluah!
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test235 b/tests/data/test235
index b6981f76d..ee843f141 100644
--- a/tests/data/test235
+++ b/tests/data/test235
@@ -23,8 +23,6 @@ worx?
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test236 b/tests/data/test236
index b92c0a65d..20d047038 100644
--- a/tests/data/test236
+++ b/tests/data/test236
@@ -1,4 +1,14 @@
<testcase>
+
+# Server-side
+<reply>
+<servercmd>
+REPLY SIZE 550 access to this file is very much denied
+REPLY APPE 550 I said: access to this file is very much denied
+REPLY STOR 550 I said: access to this file is very much denied
+</servercmd>
+</reply>
+
# Client-side
<client>
<server>
@@ -8,12 +18,10 @@ ftp
FTP resume upload but denied access to remote file
</name>
<command>
-ftp://%HOSTIP:%FTPPORT/236 -T log/ftpserver.cmd -C -
+ftp://%HOSTIP:%FTPPORT/236 -T log/file236.txt -C -
</command>
-<file name="log/ftpserver.cmd">
-REPLY SIZE 550 access to this file is very much denied
-REPLY APPE 550 I said: access to this file is very much denied
-REPLY STOR 550 I said: access to this file is very much denied
+<file name="log/file236.txt">
+Test data
</file>
</client>
diff --git a/tests/data/test237 b/tests/data/test237
index 7a020ab05..9675a1e44 100644
--- a/tests/data/test237
+++ b/tests/data/test237
@@ -1,6 +1,9 @@
<testcase>
# Server-side
<reply>
+<servercmd>
+REPLY PASV 227 Entering Passiv Mode (1216,256,2,127,127,127)
+</servercmd>
</reply>
# Client-side
@@ -14,9 +17,6 @@ FTP getting bad host in 227-response to PASV
<command>
ftp://%HOSTIP:%FTPPORT/237 --disable-epsv
</command>
-<file name="log/ftpserver.cmd">
-REPLY PASV 227 Entering Passiv Mode (1216,256,2,127,127,127)
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test238 b/tests/data/test238
index 6f2bad051..6397e3b27 100644
--- a/tests/data/test238
+++ b/tests/data/test238
@@ -1,6 +1,10 @@
<testcase>
# Server-side
<reply>
+<servercmd>
+REPLY EPSV 229 Entering Passiv Mode (|||1000000|)
+REPLY PASV 227 Entering Passiv Mode (1216,256,2,127,127,127)
+</servercmd>
</reply>
# Client-side
@@ -14,10 +18,6 @@ FTP getting bad port in response to EPSV and in response to PASV
<command>
ftp://%HOSTIP:%FTPPORT/238
</command>
-<file name="log/ftpserver.cmd">
-REPLY EPSV 229 Entering Passiv Mode (|||1000000|)
-REPLY PASV 227 Entering Passiv Mode (1216,256,2,127,127,127)
-</file>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/data/test250 b/tests/data/test250
index a6d5d1cda..2c99c46ee 100644
--- a/tests/data/test250
+++ b/tests/data/test250
@@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test252 b/tests/data/test252
index 0cbe73fa5..99d021a6e 100644
--- a/tests/data/test252
+++ b/tests/data/test252
@@ -45,9 +45,6 @@ FTP IPv6 dir list PASV
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test254 b/tests/data/test254
index b6227c7eb..19ae36389 100644
--- a/tests/data/test254
+++ b/tests/data/test254
@@ -46,9 +46,6 @@ FTP IPv6 dir list PASV and --disable-epsv
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test261 b/tests/data/test261
index 896d032e2..e3639bfe9 100644
--- a/tests/data/test261
+++ b/tests/data/test261
@@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/261
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test280 b/tests/data/test280
index b1b057137..c16999376 100644
--- a/tests/data/test280
+++ b/tests/data/test280
@@ -48,9 +48,6 @@ ftp://%HOSTIP:%FTPPORT/280/ --ftp-alternative-to-user "USER replacement"
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER anonymous
USER replacement
diff --git a/tests/data/test290 b/tests/data/test290
index 82477cba0..6078a2ac7 100644
--- a/tests/data/test290
+++ b/tests/data/test290
@@ -30,8 +30,6 @@ ftp://%HOSTIP:%FTPPORT/290 --max-filesize 30
<errorcode>
63
</errorcode>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test302 b/tests/data/test302
index bb48e9e46..c989b7263 100644
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -1,11 +1,4 @@
<testcase>
-#
-# Server-side
-<reply>
-MOOOOO
-</reply>
-
-#
# Client-side
<client>
<features>
@@ -31,10 +24,7 @@ HTTPS GET over HTTP proxy fails
<strip>
^User-Agent:.*
</strip>
-<protocol>
-</protocol>
<data>
-[insert full protocol verifiction dump here]
</data>
</verify>
</testcase>
diff --git a/tests/data/test305 b/tests/data/test305
index 4f77334bb..cfd210da9 100644
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -1,10 +1,4 @@
<testcase>
-# Server-side
-<reply>
-<data>
-</data>
-</reply>
-
# Client-side
<client>
<features>
@@ -26,8 +20,6 @@ https://%HOSTIP:%HTTPSPORT/want/305 --cacert moooo
<strip>
^User-Agent:.*
</strip>
-<protocol>
-</protocol>
<errorcode>
77
</errorcode>
diff --git a/tests/data/test400 b/tests/data/test400
index 1a8278348..75d59791e 100644
--- a/tests/data/test400
+++ b/tests/data/test400
@@ -46,9 +46,6 @@ FTPS dir list PASV unencrypted data
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test402 b/tests/data/test402
index b85822a9b..272c4e309 100644
--- a/tests/data/test402
+++ b/tests/data/test402
@@ -27,8 +27,6 @@ FTP SSL required on non-SSL server
<errorcode>
64
</errorcode>
-<strip>
-</strip>
<protocol>
AUTH SSL
AUTH TLS
diff --git a/tests/data/test511 b/tests/data/test511
index f7f73b6c5..81fe657f9 100644
--- a/tests/data/test511
+++ b/tests/data/test511
@@ -2,6 +2,10 @@
#
# Server-side
<reply>
+<servercmd>
+REPLY MDTM 550 bluah you f00l!
+REPLY SIZE 550 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -20,10 +24,6 @@ FTP with FILETIME and NOBODY but missing file
<command>
ftp://%HOSTIP:%FTPPORT/511
</command>
-<file name="log/ftpserver.cmd">
-REPLY MDTM 550 bluah you f00l!
-REPLY SIZE 550 bluah you f00l!
-</file>
</client>
#
diff --git a/tests/data/test520 b/tests/data/test520
index ad2b8f5e6..0938b5802 100644
--- a/tests/data/test520
+++ b/tests/data/test520
@@ -5,6 +5,9 @@
<data>
contents of file
</data>
+<servercmd>
+REPLY MDTM 213 20030405060708
+</servercmd>
</reply>
# Client-side
@@ -23,9 +26,6 @@ FTP RETR with FILETIME
<command>
ftp://%HOSTIP:%FTPPORT/520
</command>
-<file name="log/ftpserver.cmd">
-REPLY MDTM 213 20030405060708
-</file>
</client>
#
diff --git a/tests/data/test521 b/tests/data/test521
index 012ea18a9..57f413f7a 100644
--- a/tests/data/test521
+++ b/tests/data/test521
@@ -46,9 +46,6 @@ ftp://%HOSTIP/520/ %FTPPORT
#
# Verify data after the test has been "shot"
<verify>
-<strip>
-filter off really nothing
-</strip>
<protocol>
USER xxx
PASS yyy
diff --git a/tests/data/test526 b/tests/data/test526
index 1cd3e6a73..636edebea 100644
--- a/tests/data/test526
+++ b/tests/data/test526
@@ -37,8 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/526
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test527 b/tests/data/test527
index ed89a4553..fc661692b 100644
--- a/tests/data/test527
+++ b/tests/data/test527
@@ -37,8 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/527
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test528 b/tests/data/test528
index 1079491d1..bf13e923b 100644
--- a/tests/data/test528
+++ b/tests/data/test528
@@ -40,8 +40,6 @@ http://%HOSTIP:%HTTPPORT/path/528
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
GET /path/528 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
diff --git a/tests/data/test530 b/tests/data/test530
index 5586d6e91..80efe465f 100644
--- a/tests/data/test530
+++ b/tests/data/test530
@@ -56,8 +56,6 @@ http://%HOSTIP:%HTTPPORT/path/530
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
GET /path/530 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
diff --git a/tests/data/test532 b/tests/data/test532
index d80a53ae4..dec8ae398 100644
--- a/tests/data/test532
+++ b/tests/data/test532
@@ -37,8 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/532
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test533 b/tests/data/test533
index 1d62dc6bb..fec57a139 100644
--- a/tests/data/test533
+++ b/tests/data/test533
@@ -35,8 +35,6 @@ ftp://%HOSTIP:%FTPPORT/path/533 ftp://%HOSTIP:%FTPPORT/path/533
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test534 b/tests/data/test534
index 7f52b69c4..5aae610cb 100644
--- a/tests/data/test534
+++ b/tests/data/test534
@@ -35,8 +35,6 @@ ftp://non-existing-host.haxx.se/path/534 ftp://%HOSTIP:%FTPPORT/path/534
# Verify data after the test has been "shot"
<verify>
-<strip>
-</strip>
<protocol>
USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test538 b/tests/data/test538
index e97b69df4..070599dad 100644
--- a/tests/data/test538
+++ b/tests/data/test538
@@ -5,8 +5,12 @@ FTP
FAILURE
</keywords>
</info>
+
# Server-side
<reply>
+<servercmd>
+REPLY PASS 314 bluah you f00l!
+</servercmd>
</reply>
# Client-side
@@ -24,9 +28,6 @@ FTP multi-interface download, failed login: PASS not valid
<command>
ftp://%HOSTIP:%FTPPORT/538
</command>
-<file name="log/ftpserver.cmd">
-REPLY PASS 314 bluah you f00l!
-</file>
</client>
# Verify data after the test has been "shot"