From 040a4443a1d36447535d45953d385a8d70f3b064 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Thu, 13 Mar 2008 22:51:39 +0000 Subject: Added tests 622-625 to test SFTP/SCP uploads. Test 625 was an attempt to reproduce the --ftp-create-dirs problem reported by Brian Ulm, but that seems to need a call curl_easy_reset() which this test case doesn't do. --- tests/data/Makefile.am | 2 +- tests/data/test622 | 43 +++++++++++++++++++++++++++++++++++++++++++ tests/data/test623 | 43 +++++++++++++++++++++++++++++++++++++++++++ tests/data/test624 | 47 +++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test625 | 47 +++++++++++++++++++++++++++++++++++++++++++++++ tests/libtest/test610.pl | 47 ++++++++++++++++++++++++++++------------------- 6 files changed, 209 insertions(+), 20 deletions(-) create mode 100644 tests/data/test622 create mode 100644 tests/data/test623 create mode 100644 tests/data/test624 create mode 100644 tests/data/test625 (limited to 'tests') diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index f2ffbd52f..9a0debc27 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -49,7 +49,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test546 test1013 test1014 test1015 test547 test548 test549 test550 \ test551 test552 test1016 test1017 test1018 test1019 test1020 test553 \ test1021 test1022 test1023 test309 test616 test617 test618 test619 \ - test620 test621 + test620 test621 test622 test623 test624 test625 filecheck: @mkdir test-place; \ diff --git a/tests/data/test622 b/tests/data/test622 new file mode 100644 index 000000000..e91a8adae --- /dev/null +++ b/tests/data/test622 @@ -0,0 +1,43 @@ + + + +SFTP +SFTP put +FAILURE + + + +# +# Server-side + + + +# +# Client-side + + +sftp + + +SFTP put failure + + +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file622.txt sftp://%HOSTIP:%SSHPORT%PWD/log/nonexistent-directory/nonexistent-file + + +Test data +for ssh upload test + + + +# +# Verify data after the test has been "shot" + + +78 + + +disable + + + diff --git a/tests/data/test623 b/tests/data/test623 new file mode 100644 index 000000000..c5b258dfd --- /dev/null +++ b/tests/data/test623 @@ -0,0 +1,43 @@ + + + +SCP +SCP upload +FAILURE + + + +# +# Server-side + + + +# +# Client-side + + +scp + + +SCP upload failure + + +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file623.txt scp://%HOSTIP:%SSHPORT%PWD/log/nonexistent-directory/nonexistent-file + + +Test data +for ssh upload test + + + +# +# Verify data after the test has been "shot" + + +79 + + +disable + + + diff --git a/tests/data/test624 b/tests/data/test624 new file mode 100644 index 000000000..818c544a5 --- /dev/null +++ b/tests/data/test624 @@ -0,0 +1,47 @@ + + + +SFTP +SFTP put +--ftp-create-dirs + + + +# +# Server-side + + + +# +# Client-side + + +sftp + + +SFTP put with --ftp-create-dirs + + +--ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file624.txt sftp://%HOSTIP:%SSHPORT%PWD/log/test624.dir/upload.624 + + +perl %SRCDIR/libtest/test610.pl move %PWD/log/test624.dir/upload.624 %PWD/log/upload.624 rmdir %PWD/log/test624.dir + + +Test data +for ssh upload test + + + +# +# Verify data after the test has been "shot" + + +Test data +for ssh upload test + + +disable + + + diff --git a/tests/data/test625 b/tests/data/test625 new file mode 100644 index 000000000..ce4b8bc2c --- /dev/null +++ b/tests/data/test625 @@ -0,0 +1,47 @@ + + + +SFTP +SFTP put +--ftp-create-dirs + + + +# +# Server-side + + + +# +# Client-side + + +sftp + + +SFTP put with --ftp-create-dirs twice + + +--ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file625.txt sftp://%HOSTIP:%SSHPORT%PWD/log/test625.a/upload.625 -T log/file625.txt sftp://%HOSTIP:%SSHPORT%PWD/log/test625.b/upload.625 + + +perl %SRCDIR/libtest/test610.pl move %PWD/log/test625.a/upload.625 %PWD/log/upload.625 rmdir %PWD/log/test625.a rm %PWD/log/test625.b/upload.625 rmdir %PWD/log/test625.b + + +Test data +for ssh upload test + + + +# +# Verify data after the test has been "shot" + + +Test data +for ssh upload test + + +disable + + + diff --git a/tests/libtest/test610.pl b/tests/libtest/test610.pl index 5d7c1f6aa..4b6903a30 100755 --- a/tests/libtest/test610.pl +++ b/tests/libtest/test610.pl @@ -1,24 +1,33 @@ #!/usr/bin/env perl -# Create and remove directories and check their existence -if ( $#ARGV != 1 ) +# Perform simple file and directory manipulation in a portable way +if ( $#ARGV <= 0 ) { - print "Usage: $0 mkdir|rmdir|gone path\n"; + print "Usage: $0 mkdir|rmdir|unlink|move|gone path1 [path2] [more commands...]\n"; exit 1; } -if ($ARGV[0] eq "mkdir") -{ - mkdir $ARGV[1] || die "$!"; - exit 0; -} -elsif ($ARGV[0] eq "rmdir") -{ - rmdir $ARGV[1] || die "$!"; - exit 0; -} -elsif ($ARGV[0] eq "gone") -{ - ! -e $ARGV[1] || die "Path $ARGV[1] exists"; - exit 0; + +use File::Copy; +while(@ARGV) { + my $cmd = shift @ARGV; + my $arg = shift @ARGV; + if ($cmd eq "mkdir") { + mkdir $arg || die "$!"; + } + elsif ($cmd eq "rmdir") { + rmdir $arg || die "$!"; + } + elsif ($cmd eq "rm") { + unlink $arg || die "$!"; + } + elsif ($cmd eq "move") { + my $arg2 = shift @ARGV; + move($arg,$arg2) || die "$!"; + } + elsif ($cmd eq "gone") { + ! -e $arg || die "Path $arg exists"; + } else { + print "Unsupported command $cmd\n"; + exit 1; + } } -print "Unsupported command $ARGV[0]\n"; -exit 1; +exit 0; -- cgit v1.2.3