Added tests 616 and 617 to see how SFTP and SCP cope with zero-length

files, as questioned by Mike Protts. SFTP does for me but SCP doesn't
so test 617 is disabled for now.

diff --git a/CHANGES b/CHANGES
index e5fa5f82d30e988c618b69241d26e25fe4f140aa..fcc1e23690912e53498cc6460b3b2f15998fe827 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,13 @@
 
                                   Changelog
 
+Daniel Fandrich (5 Mar 2008)
+- Fixed the test harness so it will write out zero-length data files.
+
+- Added tests 616 and 617 to see how SFTP and SCP cope with zero-length
+  files, as questioned by Mike Protts. SFTP does for me but SCP doesn't
+  so test 617 is disabled for now.
+
 Daniel S (4 Mar 2008)
 - Mike Protts brought a patch that makes resumed transfers work with SFTP.
 

diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 95953eab345445837d81d09c20f8cffdcff98126..eb8bc31901e2881ac201774a921b4f3c7bd242c7 100644 (file)
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -3,4 +3,4 @@
 # test cases are run by runtests.pl. Just add the plain test case numbers, one
 # per line.
 # Lines starting with '#' letters are treated as comments.
-#1009
+617

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index e4e14b5140b859907cf331a0a43c976b51131d87..c5058e331dbf08ea5c6dd27c4cbfd82098116025 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -48,7 +48,7 @@ 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
+ test1021 test1022 test1023 test309 test616 test617
 
 filecheck:
        @mkdir test-place; \

diff --git a/tests/data/test616 b/tests/data/test616
new file mode 100644 (file)
index 0000000..28e3402
--- /dev/null
+++ b/tests/data/test616
@@ -0,0 +1,39 @@
+<testcase>
+<info>
+<keywords>
+SFTP
+zero-length
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data sendzero="yes">
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+sftp
+</server>
+ <name>
+SFTP retrieval of empty file
+ </name>
+ <command>
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%PWD/log/file616.txt
+</command>
+<file name="log/file616.txt">
+</file>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<valgrind>
+disable
+</valgrind>
+</verify>
+</testcase>

diff --git a/tests/data/test617 b/tests/data/test617
new file mode 100644 (file)
index 0000000..acd7f74
--- /dev/null
+++ b/tests/data/test617
@@ -0,0 +1,39 @@
+<testcase>
+<info>
+<keywords>
+SCP
+zero-length
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data sendzero="yes">
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+scp
+</server>
+ <name>
+SCP retrieval of empty file
+ </name>
+ <command>
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%PWD/log/file617.txt
+</command>
+<file name="log/file617.txt">
+</file>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<valgrind>
+disable
+</valgrind>
+</verify>
+</testcase>