Revert "Update to 7.44.0"

[platform/upstream/curl.git] / tests / data / test130

diff --git a/tests/data/test130 b/tests/data/test130
index 0eb3364..827b1a0 100644 (file)
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -9,27 +10,26 @@ netrc
 #
 # Server-side
 <reply>
-<data>
-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
-</data>
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+<datacheck mode="text">
+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
+</datacheck>
 </reply>
 
 #
 # Client-side
 <client>
-<features>
-netrc_debug
-</features>
 <server>
 ftp
 </server>
@@ -37,9 +37,9 @@ ftp
 FTP (optional .netrc; no user/pass) dir list PASV
  </name>
  <command>
---netrc-optional ftp://%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc130 ftp://%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc" >
+<file name="log/netrc130" >
 # the following two lines were created while testing curl
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
@@ -49,9 +49,6 @@ machine %HOSTIP login user2 password passwd2
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-filter off really nothing
-</strip>
 <protocol>
 USER user1\r
 PASS passwd1\r
@@ -62,3 +59,4 @@ LIST
 QUIT\r
 </protocol>
 </verify>
+</testcase>