two more ftp directory re-use tests added

diff --git a/CHANGES b/CHANGES
index 4a4d7514007485650884e71060cfe4d7d4b71d8e..f7210327426cbd9c416d88a005bd05e41aea5e7e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,10 @@
 
 
 Daniel (16 December 2004)
+- Gisle found and fixed a problem in the directory re-use for FTP.
+
+  I added test case 215 and 216 to better verify the functionality.
+
 - Dinar in bug report #1086121, found a file handle leak when a multipart
   formpost (including a file upload part) was aborted before the whole file
   was sent.

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 3e866023d70fad872688fe422202ad5e4a757af3..41a9366a32409152a9105ecf5fb9492e415320c0 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -30,7 +30,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46        \
  test193 test194 test195 test196 test197 test198 test515 test516       \
  test517 test518 test210 test211 test212 test220 test221 test222       \
  test223 test224 test206 test207 test208 test209 test213 test240        \
- test241 test242 test519 test214
+ test241 test242 test519 test214 test215 test216
 
 # The following tests have been removed from the dist since they no longer
 # work. We need to fix the test suite's FTPS server first, then bring them

diff --git a/tests/data/test215 b/tests/data/test215
new file mode 100644 (file)
index 0000000..677d6e6
--- /dev/null
+++ b/tests/data/test215
@@ -0,0 +1,49 @@
+# Server-side
+<reply>
+<datacheck>
+total 20\r
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .\r
+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..\r
+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT\r
+-r--r--r--   1 0        1             35 Jul 16  1996 README\r
+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin\r
+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev\r
+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html\r
+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc\r
+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub\r
+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr\r
+</datacheck>
+
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+Get two FTP dir listings from the same remote dir: no second CWD
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/a/path/215/ ftp://%HOSTIP:%FTPPORT/a/path/215/
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous\r
+PASS curl_by_daniel@haxx.se\r
+PWD\r
+CWD a\r
+CWD path\r
+CWD 215\r
+EPSV\r
+TYPE A\r
+LIST\r
+EPSV\r
+TYPE A\r
+LIST\r
+QUIT\r
+</protocol>
+</verify>

diff --git a/tests/data/test216 b/tests/data/test216
new file mode 100644 (file)
index 0000000..2363642
--- /dev/null
+++ b/tests/data/test216
@@ -0,0 +1,38 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP upload two files to the same dir
+ </name>
+ <command>
+-T log/upload.216 ftp://%HOSTIP:%FTPPORT/a/path/216/ -T log/upload.216 ftp://%HOSTIP:%FTPPORT/a/path/216/%2e%2eanotherup
+</command>
+<file name="log/upload.216">
+upload this file twice
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous\r
+PASS curl_by_daniel@haxx.se\r
+PWD\r
+CWD a\r
+CWD path\r
+CWD 216\r
+EPSV\r
+TYPE I\r
+STOR upload.216\r
+EPSV\r
+TYPE I\r
+STOR ..anotherup\r
+QUIT\r
+</protocol>
+</verify>