diff options
| -rw-r--r-- | tests/data/test156 | 25 | ||||
| -rw-r--r-- | tests/data/test210 | 12 | ||||
| -rw-r--r-- | tests/data/test211 | 10 | ||||
| -rw-r--r-- | tests/data/test212 | 9 |
4 files changed, 18 insertions, 38 deletions
diff --git a/tests/data/test156 b/tests/data/test156 index 9a9aae9aa..0ff9fd10e 100644 --- a/tests/data/test156 +++ b/tests/data/test156 @@ -1,36 +1,13 @@ # Server-side <reply> <data> -HTTP/1.1 200 No Authorization Required swsclose swsbounce
-Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-Content-Type: text/html; charset=iso-8859-1
-Connection: close
-
-</data> - -<data1> HTTP/1.1 200 No Authorization Required swsclose
Server: Apache/1.3.27 (Darwin) PHP/4.1.2
Content-Type: text/html; charset=iso-8859-1
Connection: close
PUT received fine. Thank you very much -</data1> - -<datacheck> -HTTP/1.1 200 No Authorization Required swsclose swsbounce
-Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-Content-Type: text/html; charset=iso-8859-1
-Connection: close
-
-HTTP/1.1 200 No Authorization Required swsclose
-Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-Content-Type: text/html; charset=iso-8859-1
-Connection: close
-
-PUT received fine. Thank you very much -</datacheck> - +</data> </reply> # Client-side diff --git a/tests/data/test210 b/tests/data/test210 index 723508086..f42aaecf7 100644 --- a/tests/data/test210 +++ b/tests/data/test210 @@ -3,10 +3,8 @@ <data> data blobb </data> -<datacheck> -data blobb -data blobb -</datacheck> + +# data is sent to stdout </reply> # Client-side @@ -20,7 +18,11 @@ Get two FTP files from the same remote dir: no second CWD <command> ftp://%HOSTIP:%FTPPORT/a/path/210 ftp://%HOSTIP:%FTPPORT/a/path/210 </command> -</test> +<stdout> +data blobb +data blobb +</stdout> +</client> # Verify data after the test has been "shot" <verify> diff --git a/tests/data/test211 b/tests/data/test211 index c59da0b1e..761852862 100644 --- a/tests/data/test211 +++ b/tests/data/test211 @@ -3,10 +3,6 @@ <data> data blobb </data> -<datacheck> -data blobb -data blobb -</datacheck> </reply> # Client-side @@ -23,7 +19,11 @@ ftp://%HOSTIP:%FTPPORT/a/path/211 ftp://%HOSTIP:%FTPPORT/a/path/211 <file name="log/ftpserver.cmd"> REPLY EPSV 500 no such command </file> -</test> +<stdout> +data blobb +data blobb +</stdout> +</client> # Verify data after the test has been "shot" <verify> diff --git a/tests/data/test212 b/tests/data/test212 index 9f51515c6..4f29186ee 100644 --- a/tests/data/test212 +++ b/tests/data/test212 @@ -3,9 +3,6 @@ <data> data blobb </data> -<datacheck> -data blobb -data blobb </datacheck> </reply> @@ -27,7 +24,11 @@ ftp://%HOSTIP:%FTPPORT/a/path/212 ftp://%HOSTIP:%FTPPORT/a/path/212 -P - REPLY EPRT 500 no such command REPLY LPRT 500 no such command </file> -</test> +<stdout> +data blobb +data blobb +</stdout> +</client> # Verify data after the test has been "shot" <verify> |