diff options
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/data/test103 | 6 | ||||
| -rw-r--r-- | tests/data/test252 | 57 | ||||
| -rw-r--r-- | tests/data/test253 | 57 | ||||
| -rw-r--r-- | tests/data/test254 | 58 | ||||
| -rw-r--r-- | tests/data/test255 | 58 | 
6 files changed, 235 insertions, 3 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 66c5f52ef..a1e455efa 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -34,7 +34,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	\   test199 test225 test226 test227 test230 test231 test232 test228	\   test229 test233 test234 test235 test236 test520 test237 test238 \   test239 test243 test245 test246 test247 test248 test249 test250 \ - test251 + test251 test252 test253 test254 test255  # 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/test103 b/tests/data/test103 index 87a640d20..b7ae60baf 100644 --- a/tests/data/test103 +++ b/tests/data/test103 @@ -26,8 +26,8 @@ ftp://%HOSTIP:%FTPPORT/a/path/103 -P -  # Verify data after the test has been "shot"  <verify>  <strippart> -s/^LPRT.*[\n]// -s/^EPRT.*[\n]// +s/^LPRT.*/LPRT/ +s/^EPRT.*/EPRT/  s/^(PORT 127,0,0,1,)([0-9,]+)/$1/  </strippart>  <protocol> @@ -36,6 +36,8 @@ PASS curl_by_daniel@haxx.se  PWD
  CWD a
  CWD path
 +EPRT +LPRT  PORT 127,0,0,1,
  TYPE I
  SIZE 103
 diff --git a/tests/data/test252 b/tests/data/test252 new file mode 100644 index 000000000..3e5ffa6d3 --- /dev/null +++ b/tests/data/test252 @@ -0,0 +1,57 @@ +<info> +<keywords> +FTP-ipv6 +EPSV +</keywords> +</info> +# +# Server-side +<reply> +<data> +total 20
 +drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
 +drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
 +drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
 +-r--r--r--   1 0        1             35 Jul 16  1996 README
 +lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
 +dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
 +drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
 +dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
 +drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
 +dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 +</data> +</reply> + +# +# Client-side +<client> +<features> +ipv6 +</features> +<server> +ftp-ipv6 +</server> + <name> +FTP IPv6 dir list PASV + </name> + <command> +-g "ftp://%HOST6IP:%FTP6PORT/" +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +filter off really nothing +</strip> +<protocol> +USER anonymous
 +PASS curl_by_daniel@haxx.se
 +PWD
 +EPSV
 +TYPE A
 +LIST
 +QUIT
 +</protocol> +</verify> diff --git a/tests/data/test253 b/tests/data/test253 new file mode 100644 index 000000000..7f66ae604 --- /dev/null +++ b/tests/data/test253 @@ -0,0 +1,57 @@ +<info> +<keywords> +FTP-ipv6 +EPRT +</keywords> +</info> +# +# Server-side +<reply> +<data> +total 20
 +drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
 +drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
 +drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
 +-r--r--r--   1 0        1             35 Jul 16  1996 README
 +lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
 +dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
 +drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
 +dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
 +drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
 +dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 +</data> +</reply> + +# +# Client-side +<client> +<features> +ipv6 +</features> +<server> +ftp-ipv6 +</server> + <name> +FTP IPv6 dir list with EPRT + </name> + <command> +-g "ftp://%HOST6IP:%FTP6PORT/" -P - +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strippart> +s/^(EPRT \|2\|::1\|)(.*)/$1/ +</strippart> +<protocol> +USER anonymous
 +PASS curl_by_daniel@haxx.se
 +PWD
 +EPRT |2|::1| +TYPE A
 +LIST
 +QUIT
 +</protocol> +</verify> diff --git a/tests/data/test254 b/tests/data/test254 new file mode 100644 index 000000000..8466ce200 --- /dev/null +++ b/tests/data/test254 @@ -0,0 +1,58 @@ +<info> +<keywords> +FTP-ipv6 +EPSV +--disable-epsv +</keywords> +</info> +# +# Server-side +<reply> +<data> +total 20
 +drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
 +drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
 +drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
 +-r--r--r--   1 0        1             35 Jul 16  1996 README
 +lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
 +dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
 +drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
 +dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
 +drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
 +dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 +</data> +</reply> + +# +# Client-side +<client> +<features> +ipv6 +</features> +<server> +ftp-ipv6 +</server> + <name> +FTP IPv6 dir list PASV and --disable-epsv + </name> + <command> +-g "ftp://%HOST6IP:%FTP6PORT/" --disable-epsv +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +filter off really nothing +</strip> +<protocol> +USER anonymous
 +PASS curl_by_daniel@haxx.se
 +PWD
 +EPSV
 +TYPE A
 +LIST
 +QUIT
 +</protocol> +</verify> diff --git a/tests/data/test255 b/tests/data/test255 new file mode 100644 index 000000000..212847356 --- /dev/null +++ b/tests/data/test255 @@ -0,0 +1,58 @@ +<info> +<keywords> +FTP-ipv6 +EPRT +--disable-eprt +</keywords> +</info> +# +# Server-side +<reply> +<data> +total 20
 +drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
 +drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
 +drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
 +-r--r--r--   1 0        1             35 Jul 16  1996 README
 +lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
 +dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
 +drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
 +dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
 +drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
 +dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 +</data> +</reply> + +# +# Client-side +<client> +<features> +ipv6 +</features> +<server> +ftp-ipv6 +</server> + <name> +FTP IPv6 dir list with EPRT and --disable-eprt + </name> + <command> +-g "ftp://%HOST6IP:%FTP6PORT/" -P - --disable-eprt +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strippart> +s/^(EPRT \|2\|::1\|)(.*)/$1/ +</strippart> +<protocol> +USER anonymous
 +PASS curl_by_daniel@haxx.se
 +PWD
 +EPRT |2|::1| +TYPE A
 +LIST
 +QUIT
 +</protocol> +</verify>  | 
