Various test file cleanups, including using <servercmd> instead of writing

directly to ftpserver.cmd and removing unneeded empty sections.

diff --git a/tests/data/test100 b/tests/data/test100
index e27b05b4e62a5dfc9b1fa933ed9dbcab4dfda34e..6127163b2d6b56d30a25131efe36d682ed7f44d3 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test102 b/tests/data/test102
index 692a4f6cd056e495a10876491d5b66fad5c97560..141bc0f353600bee20f53b0dd2ae4fcd8568da1c 100644 (file)
--- 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 d3a0a4f2d2c8272bfdc6b76fe955698f55f8600a..cab24f71d68e7a529bfb81e6e32910bc7db754a8 100644 (file)
--- 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 b2e80654dbb02ad86fd94a7dd867247f927047c3..c027885b1f8e903e4ce56284d133a7f3b4766561 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test110 b/tests/data/test110
index 2b6f42f86e166e1b637f207b0389b8f4ed23bf26..b63ba8a2dbc67310dcc502335e1e0b8924a6c15d 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test111 b/tests/data/test111
index ee81fc6fafcb0769dd064c1a8598711f1f51b555..bcaa55425db409eb4b0f9782e7866785bfa90c67 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test112 b/tests/data/test112
index 6e4b20c090ce676957793b3c4d3a9722411fc9d4..eb3400c575854f3157b69b8b3a94891a44efa51f 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test113 b/tests/data/test113
index 39d200e52b93406efe99e831094df7abd05adadd..0046297cf0c102bb747953b8d64226c11d9f29e1 100644 (file)
--- 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 70f1f6ad60da2adbde3342d3eec14b5b70799dd4..6611aedeb6f1247586a3b74f7feac0548a4e6a20 100644 (file)
--- 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 d4df5ebcc77106ad72e14988ba3d9c4ec269d527..f37a7e9fddae6baceb706a09079535e5c96be960 100644 (file)
--- 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 e049e6f43e6c3efa7ffd1e4f7671ae26e5c43de1..d3718e39335cff161e68466d7cfd22f7cc31f0de 100644 (file)
--- 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 35c7a18337ed48c21d301a446bf48d703853f013..2caad0da5bcee4b888ec72d4d19ba5e81881322b 100644 (file)
--- 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 f8f6dd11485661c80fc0c691751154b2dbf62495..6cd086ca239b839c9a7d9ee17fad96ea655f03d6 100644 (file)
--- 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 8c13960dd6e7c567caeb6b27b6f24954bcc8fe58..0db6d297cdd1a5eba8692adf1c62f5eaf357bacc 100644 (file)
--- 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 2e50fabd7ab41668014633f32e41547c67e3a64b..85d49f5296b8f1c897a75208d310d9fa5afae996 100644 (file)
--- 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 2760687410201baf20d030bfb8ce3dd2ff169f5f..fb1dd05fc3f276abea70a83299e38da2cb059403 100644 (file)
--- 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 6e01dba38e1b0c1bcfb08441d677797025571adc..255d8731f181e2bf209a21a372baa335442055f7 100644 (file)
--- 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 d9b6205d68a36baba0475c083510107b8d4518df..5677aeb47ae724e3922862d6f3be0bca990eccaa 100644 (file)
--- 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 92ae37bb2365e3a8ebf37642ff94bea29339fb66..0872214af843ed81ef684a8feb4b4d723090916a 100644 (file)
--- 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 c1e9cd998a3dd23a032a1e6a6796e21c7470196b..43ab24c09fbc92fd36fa755bd8717bb290678dc2 100644 (file)
--- 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\r
 PASS passwd1\r

diff --git a/tests/data/test131 b/tests/data/test131
index d14bea47c13a0b08b81b7f305382bcd0e0ede5b0..5f9eb6ac152943955ab25d068f440712a2f62840 100644 (file)
--- 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\r
 PASS passwd2\r

diff --git a/tests/data/test132 b/tests/data/test132
index c03e8ed419a36f486b6017c349bfb60db721d902..2ff39fb9a7bd887fafde33318f5e9040f82c6d67 100644 (file)
--- 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\r
 PASS mark\r

diff --git a/tests/data/test133 b/tests/data/test133
index 6016a64f1520b01ddb5cc96b54a8b278564132c9..2e6b2c3a40147efaa03530ccd18839abdc7d2702 100644 (file)
--- 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\r
 PASS passwd1\r

diff --git a/tests/data/test134 b/tests/data/test134
index a18cbaa55fb1c61bdfde24aada17fafc5c89c1bc..8ff9c190283fc709db599daefefa27c4310bb1c8 100644 (file)
--- 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\r
 PASS rhemus\r

diff --git a/tests/data/test137 b/tests/data/test137
index 75dbe6af7d772b943f52aea39392d4779a07b422..11068cbd859ab3120dbf953a45bf4d52e32ed0b1 100644 (file)
--- 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 6c8ecd5b211a0db71b6fc3e5a0b680aae3316393..e0de7d22b56e8fa608d804f52d58a546be419b9f 100644 (file)
--- 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 eec3b373198d3d22a0e4b1b371eb778bf09f7085..4a9f0038ea68a374058f47e74bb32c9bbdadd402 100644 (file)
--- 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 708c67264b877918b1a874d134ec63685b9ec7c3..931d52745b0b261f322053a641d2bae47124c0c1 100644 (file)
--- 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 48a3e9fa0b1a7d446a1a5423b333aed78cd6e2c0..9d2b27aeacc929463e7a203708d13e5643bf43f9 100644 (file)
--- 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 50a651d9c5b79e3e0da0ed49271a18cf88f95f8e..ace4b4d4e963427ec7f0306ab81c4de0a7eb378c 100644 (file)
--- 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 4ac85af4a623590dcdde2625e60798095ceb66bc..722ef365d9a22a2ca7da8eba33174dff7c921ca9 100644 (file)
--- 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 556b08ee4fdb30a0fe2d1c39c6c2a7046b705221..788c89a023e559c5c99ba07618f599cae2e947f8 100644 (file)
--- 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 6c84bd8180308baae782b66046d024e1593ff846..663eaf2e09798f9c1f184291c333f07a746b406b 100644 (file)
--- 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 72252a8635b93fca2026723227eacce5920c397b..0214effc86886badf48e69635aa0e2c415b08517 100644 (file)
--- 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 655a32f38f9247e7bd652a9d8e318adad48fe4df..d00e677d75e53788bea862ef587ee01e362f8a3c 100644 (file)
--- 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 d6cac8d47e0db19e3fb2c6568b7006643e323e9f..6f8f8612139ec0ab8e4a436c32372c11071d91a8 100644 (file)
--- 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 0c4e0a0698fa5fa5767f746f84588951adb646ac..4a4a295c45e5e860f768b40fcfaea8b3cde4a14f 100644 (file)
--- 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 f036f245c1b55b7d642c0cb25f11e058d051aa18..dffcc11101fa8b5165aa2c9095c67e231804287f 100644 (file)
--- 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 b6981f76dbb53b3cd4390a076055fe57d6b2c5e5..ee843f141ff8404b34c371e17866e9f0a280a4b1 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test236 b/tests/data/test236
index b92c0a65d6c62eb9084b3c6e762e7b813baa4b7a..20d047038f814fa25da9ff500d091c517089e475 100644 (file)
--- 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 7a020ab0523e6371ba4008d53e8df6c0b91deeac..9675a1e44e0624df7bcbdcadb4f8ccfa5d1d6fe7 100644 (file)
--- 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 6f2bad0510a50c4c12eb351e3daf8ac910fdd122..6397e3b27dc843a9f74574bfcb88e44f4719652c 100644 (file)
--- 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 a6d5d1cda68fcc785c60be83a49c3c8a1e5e7406..2c99c46eefffd6c5da515c847a3968382fac96c3 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test252 b/tests/data/test252
index 0cbe73fa5a187180bec3f071e5bc950a2070eb2d..99d021a6e135a0cf2d07d11443880d0e728b782d 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test254 b/tests/data/test254
index b6227c7eb1bef63263a16a8e16a51e60253ae5dc..19ae36389c48bc8290bf70ace37dfd9eb4b2b731 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test261 b/tests/data/test261
index 896d032e284090388bf06adfc5dca0a5d758869b..e3639bfe93d5215a1a0624ccb1576d587fd3a9e3 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test280 b/tests/data/test280
index b1b05713795533c423ee24738ad0ac0095daec35..c1699937635c05d2e13267a7a3ededc411ce0492 100644 (file)
--- 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\r
 USER replacement\r

diff --git a/tests/data/test290 b/tests/data/test290
index 82477cba0f997840549b42c6ff7c431d4a7e037d..6078a2ac7d62a1baf735eacd11f483589e07125b 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test302 b/tests/data/test302
index bb48e9e469e7a9869eacb2f5bf3aa094be30c0ac..c989b72638bbbcc1ceb5e57a79803084daf56cc6 100644 (file)
--- 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 4f77334bba84d99edaa48b6a86c0280f32ee733c..cfd210da9c853214a183a5182035035a9c722178 100644 (file)
--- 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 1a8278348a921f0286d3e7c51c18eaa9eaeb7dea..75d59791efb203d17259c4a8cc08dd49edef6111 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test402 b/tests/data/test402
index b85822a9b0e9547b031bb111d996c6cacf29e02a..272c4e30948bce27ce9aba6614f2f82418236744 100644 (file)
--- 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\r
 AUTH TLS\r

diff --git a/tests/data/test511 b/tests/data/test511
index f7f73b6c5caec7acdf1a1525434bf66bf680b510..81fe657f9eb1c01c63321de2bccb8f16157d59a8 100644 (file)
--- 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 ad2b8f5e66cf43286cad41e1a410022dd4cf8395..0938b580281cdaa196c9cb0b4902ae491324bc94 100644 (file)
--- 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 012ea18a93dba3e70a8ac9f307c642fe40df1f2d..57f413f7a43ae130471162d57c754d0d53291baa 100644 (file)
--- 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\r
 PASS yyy\r

diff --git a/tests/data/test526 b/tests/data/test526
index 1cd3e6a73597674686cfe876526193f8d94688f0..636edebea2ee48e8f0bfa5166c0a5f89a6ee0508 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test527 b/tests/data/test527
index ed89a455369c9afda6b2b3c4faf82fe3a40a27f4..fc661692b6e0df98b6caed6def5a7834e5f6610b 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test528 b/tests/data/test528
index 1079491d1df52986f7edd20f19306c1d4f4e5eb5..bf13e923b780e0de7982838d69baed1e692d66be 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test530 b/tests/data/test530
index 5586d6e91f770c3b107c4221f8e3f2dba842c63c..80efe465f8ae428332c95cd2f63180768ed031a6 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test532 b/tests/data/test532
index d80a53ae4dd18747f7000c9cfe11d9afb881fc86..dec8ae39802b7ba7e874e863fabf416cc7b76d4c 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test533 b/tests/data/test533
index 1d62dc6bb223ea5bc26b51509940b2f54c8069d6..fec57a1391cdbc4a429c26ba438f685c048d9506 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test534 b/tests/data/test534
index 7f52b69c49d9b3a89636de2307b51157e9af3102..5aae610cbd532140a1b30c47b8881c00709b9a8f 100644 (file)
--- 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\r
 PASS ftp@example.com\r

diff --git a/tests/data/test538 b/tests/data/test538
index e97b69df4bc79ebbb7568be4e3eef8a8122ee47e..070599dad83632b9416af8ca349f52d48ec01800 100644 (file)
--- 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"