diff options
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | tests/data/Makefile.am | 3 | ||||
-rw-r--r-- | tests/data/test618 | 39 | ||||
-rw-r--r-- | tests/data/test619 | 39 | ||||
-rw-r--r-- | tests/data/test620 | 38 | ||||
-rw-r--r-- | tests/data/test621 | 38 |
6 files changed, 160 insertions, 1 deletions
@@ -6,6 +6,10 @@ Changelog +Daniel Fandrich (10 Mar 2008) +- Added tests 618-621 to test SFTP/SCP transfers of more than one file + (test 620 tests the just-fixed problem reported by Brian Ulm). + Daniel Stenberg (9 Mar 2008) - Brian Ulm reported a crash when doing a second SFTP transfer on a re-used easy handle if curl_easy_reset() was used between them. I fixed it and Brian diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index c5058e331..f2ffbd52f 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -48,7 +48,8 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test2000 test2001 test2002 test2003 test35 test544 test545 test2004 \ test546 test1013 test1014 test1015 test547 test548 test549 test550 \ test551 test552 test1016 test1017 test1018 test1019 test1020 test553 \ - test1021 test1022 test1023 test309 test616 test617 + test1021 test1022 test1023 test309 test616 test617 test618 test619 \ + test620 test621 filecheck: @mkdir test-place; \ diff --git a/tests/data/test618 b/tests/data/test618 new file mode 100644 index 000000000..673bdcbc6 --- /dev/null +++ b/tests/data/test618 @@ -0,0 +1,39 @@ +<testcase> +<info> +<keywords> +SFTP +</keywords> +</info> + +# +# Client-side +<client> +<server> +sftp +</server> + <name> +SFTP retrieval of two files + </name> + <command> +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%PWD/log/file618.txt sftp://%HOSTIP:%SSHPORT%PWD/log/file618.txt +</command> +<file name="log/file618.txt"> +Test data +for ssh test +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<valgrind> +disable +</valgrind> +<stdout> +Test data +for ssh test +Test data +for ssh test +</stdout> +</verify> +</testcase> diff --git a/tests/data/test619 b/tests/data/test619 new file mode 100644 index 000000000..f43af52df --- /dev/null +++ b/tests/data/test619 @@ -0,0 +1,39 @@ +<testcase> +<info> +<keywords> +SCP +</keywords> +</info> + +# +# Client-side +<client> +<server> +scp +</server> + <name> +SCP retrieval of two files + </name> + <command> +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%PWD/log/file619.txt scp://%HOSTIP:%SSHPORT%PWD/log/file619.txt +</command> +<file name="log/file619.txt"> +Test data +for ssh test +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<valgrind> +disable +</valgrind> +<stdout> +Test data +for ssh test +Test data +for ssh test +</stdout> +</verify> +</testcase> diff --git a/tests/data/test620 b/tests/data/test620 new file mode 100644 index 000000000..f7a87d266 --- /dev/null +++ b/tests/data/test620 @@ -0,0 +1,38 @@ +<testcase> +<info> +<keywords> +SFTP +FAILURE +</keywords> +</info> + +# +# Client-side +<client> +<server> +sftp +</server> + <name> +SFTP retrieval of missing file followed by good file + </name> + <command> +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%PWD/log/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%PWD/log/file620.txt +</command> +<file name="log/file620.txt"> +Test data +for ssh test +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<valgrind> +disable +</valgrind> +<stdout> +Test data +for ssh test +</stdout> +</verify> +</testcase> diff --git a/tests/data/test621 b/tests/data/test621 new file mode 100644 index 000000000..9ffbf3b14 --- /dev/null +++ b/tests/data/test621 @@ -0,0 +1,38 @@ +<testcase> +<info> +<keywords> +SCP +FAILURE +</keywords> +</info> + +# +# Client-side +<client> +<server> +scp +</server> + <name> +SCP retrieval of missing file followed by good file + </name> + <command> +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%PWD/log/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%PWD/log/file621.txt +</command> +<file name="log/file621.txt"> +Test data +for ssh test +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<valgrind> +disable +</valgrind> +<stdout> +Test data +for ssh test +</stdout> +</verify> +</testcase> |