five new test cases for the netrc parsing

6 files changed, 247 insertions, 1 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 5319f6e2e..aae68b9f8 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -15,5 +15,6 @@ test104  test113  test122  test18   test23   test301  test402  test9 \
 test105  test114  test123  test19   test24   test302  test43   test31 \
 test106  test115  test124  test190  test25   test303  test44   test38 \
 test107  test116  test125  test2    test26   test33   test45   test126 \
-test304  test39   test32   test128  test48
+test304  test39   test32   test128  test48 \
+test130  test131  test132  test133  test134
 
diff --git a/tests/data/test130 b/tests/data/test130
new file mode 100644
index 000000000..21a69c02b
--- /dev/null
+++ b/tests/data/test130
@@ -0,0 +1,49 @@
+#
+# Server-side
+<reply name="1">
+<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 requires=netrc_debug>
+ <name>
+FTP (optional .netrc; no user/pass) dir list PASV
+ </name>
+ <command>
+--netrc-optional ftp://%HOSTIP:%FTPPORT/
+</command>
+<file name="log/netrc" >
+# the following two lines were created while testing curl
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER user1

+PASS passwd1

+PWD

+EPSV

+TYPE A

+LIST

+</protocol>
+</verify>
diff --git a/tests/data/test131 b/tests/data/test131
new file mode 100644
index 000000000..9576ac847
--- /dev/null
+++ b/tests/data/test131
@@ -0,0 +1,49 @@
+#
+# Server-side
+<reply name="1">
+<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 requires=netrc_debug>
+ <name>
+FTP (optional .netrc; user/no pass) dir list PASV
+ </name>
+ <command>
+--netrc-optional ftp://user2@%HOSTIP:%FTPPORT/
+</command>
+<file name="log/netrc" >
+# the following two lines were created while testing curl
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER user2

+PASS passwd2

+PWD

+EPSV

+TYPE A

+LIST

+</protocol>
+</verify>
diff --git a/tests/data/test132 b/tests/data/test132
new file mode 100644
index 000000000..128de5a0e
--- /dev/null
+++ b/tests/data/test132
@@ -0,0 +1,49 @@
+#
+# Server-side
+<reply name="1">
+<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 requires=netrc_debug>
+ <name>
+FTP (optional .netrc; user/passwd supplied) dir list PASV
+ </name>
+ <command>
+--netrc-optional ftp://mary:mark@%HOSTIP:%FTPPORT/
+</command>
+<file name="log/netrc" >
+# the following two lines were created while testing curl
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER mary

+PASS mark

+PWD

+EPSV

+TYPE A

+LIST

+</protocol>
+</verify>
diff --git a/tests/data/test133 b/tests/data/test133
new file mode 100644
index 000000000..f496e8f35
--- /dev/null
+++ b/tests/data/test133
@@ -0,0 +1,49 @@
+#
+# Server-side
+<reply name="1">
+<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 requires=netrc_debug>
+ <name>
+FTP (compulsory .netrc; ignored user/passwd) dir list PASV
+ </name>
+ <command>
+-n ftp://mary:mark@%HOSTIP:%FTPPORT/
+</command>
+<file name="log/netrc" >
+# the following two lines were created while testing curl
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER user1

+PASS passwd1

+PWD

+EPSV

+TYPE A

+LIST

+</protocol>
+</verify>
diff --git a/tests/data/test134 b/tests/data/test134
new file mode 100644
index 000000000..484946fe6
--- /dev/null
+++ b/tests/data/test134
@@ -0,0 +1,49 @@
+#
+# Server-side
+<reply name="1">
+<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 requires=netrc_debug>
+ <name>
+FTP (optional .netrc; programmatic user/passwd) dir list PASV
+ </name>
+ <command>
+--netrc-optional -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
+</command>
+<file name="log/netrc" >
+# the following two lines were created while testing curl
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+</file>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER romulus

+PASS rhemus

+PWD

+EPSV

+TYPE A

+LIST

+</protocol>
+</verify>