tests: fix test definitions # 1355, 1363, 1385 and 1393

-i without HTTP protocol shall not include headers in the output

diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 4de3ff609aededc71f17e430f8de3c5b200d3e38..5a0f2bf95dada8f9a1c644ba5d57f5fa526be87a 100644 (file)
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -5,10 +5,3 @@
 594
 1209
 1211
-#
-1355
-1363
-#
-1385
-1393
-#

diff --git a/tests/data/test1355 b/tests/data/test1355
index 50af7c614fbbb54c47ae5ff9f5a04e1c17c2d936..e7a392c1d87fbeb0104441b0dec39010f66eca12 100644 (file)
--- a/tests/data/test1355
+++ b/tests/data/test1355
@@ -55,25 +55,7 @@ mooo
 </file1>
 
 <file2 name="log/stdout1355">
-220-        _   _ ____  _     \r
-220-    ___| | | |  _ \| |    \r
-220-   / __| | | | |_) | |    \r
-220-  | (__| |_| |  _ <| |___ \r
-220    \___|\___/|_| \_\_____|\r
-331 We are happy you popped in!\r
-230 Welcome you silly person\r
-257 "/" is current directory\r
-250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
-200 I modify TYPE as you wanted\r
-213 10\r
-150 Binary data connection for 1355 () (10 bytes).\r
-226 File transfer complete\r
-221 bye bye baby\r
 </file2>
-<stripfile2>
-s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
-</stripfile2>
 
 </verify>
 </testcase>

diff --git a/tests/data/test1363 b/tests/data/test1363
index 144e1b3484c9c4ca0e0e4b39c7e1c4d0632c2d76..195ebd6affe002f33beebcf5cdbce1f037003103 100644 (file)
--- a/tests/data/test1363
+++ b/tests/data/test1363
@@ -73,25 +73,7 @@ MOOOO
 </file1>
 
 <file2 name="log/stdout1363">
-220-        _   _ ____  _     \r
-220-    ___| | | |  _ \| |    \r
-220-   / __| | | | |_) | |    \r
-220-  | (__| |_| |  _ <| |___ \r
-220    \___|\___/|_| \_\_____|\r
-331 We are happy you popped in!\r
-230 Welcome you silly person\r
-257 "/" is current directory\r
-250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
-200 I modify TYPE as you wanted\r
-213 214\r
-150 Binary data connection for 1363 () (214 bytes).\r
-226 File transfer complete\r
-221 bye bye baby\r
 </file2>
-<stripfile2>
-s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
-</stripfile2>
 
 </verify>
 </testcase>

diff --git a/tests/data/test1385 b/tests/data/test1385
index ca04b606c388996276368a8bae84f83c5b99f8f9..ee35ab7046961e085f26ec74ce1d8eec33ddff6e 100644 (file)
--- a/tests/data/test1385
+++ b/tests/data/test1385
@@ -50,25 +50,7 @@ mooo
 </file1>
 
 <file2 name="log/stdout1385">
-220-        _   _ ____  _     \r
-220-    ___| | | |  _ \| |    \r
-220-   / __| | | | |_) | |    \r
-220-  | (__| |_| |  _ <| |___ \r
-220    \___|\___/|_| \_\_____|\r
-331 We are happy you popped in!\r
-230 Welcome you silly person\r
-257 "/" is current directory\r
-250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
-200 I modify TYPE as you wanted\r
-213 10\r
-150 Binary data connection for 1385 () (10 bytes).\r
-226 File transfer complete\r
-221 bye bye baby\r
 </file2>
-<stripfile2>
-s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
-</stripfile2>
 
 </verify>
 </testcase>

diff --git a/tests/data/test1393 b/tests/data/test1393
index 9b51d4cb6d43af2ff31af9d82ae3961cfaff1182..a45e291f24ccb9df8956be64ea10318513f9568d 100644 (file)
--- a/tests/data/test1393
+++ b/tests/data/test1393
@@ -65,25 +65,7 @@ MOOOO
 </file1>
 
 <file2 name="log/stdout1393">
-220-        _   _ ____  _     \r
-220-    ___| | | |  _ \| |    \r
-220-   / __| | | | |_) | |    \r
-220-  | (__| |_| |  _ <| |___ \r
-220    \___|\___/|_| \_\_____|\r
-331 We are happy you popped in!\r
-230 Welcome you silly person\r
-257 "/" is current directory\r
-250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
-200 I modify TYPE as you wanted\r
-213 214\r
-150 Binary data connection for 1393 () (214 bytes).\r
-226 File transfer complete\r
-221 bye bye baby\r
 </file2>
-<stripfile2>
-s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
-</stripfile2>
 
 </verify>
 </testcase>