From: Daniel Stenberg Date: Mon, 5 Aug 2024 21:54:13 +0000 (+0200) Subject: tests: ignore QUIT from FTP protocol comparisons X-Git-Tag: curl-8_10_0~351 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd4aee156f64f44bb1f1;p=thirdparty%2Fcurl.git tests: ignore QUIT from FTP protocol comparisons - QUIT is not an important FTP command - curl only sends it "best effort", meaning it might not be sent - it is a known "flaky" thing in test output because of this Closes #14404 --- diff --git a/tests/data/test100 b/tests/data/test100 index b7554383ea..54d31744b7 100644 --- a/tests/data/test100 +++ b/tests/data/test100 @@ -41,6 +41,9 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1000 b/tests/data/test1000 index fe94010ac3..e102a006e0 100644 --- a/tests/data/test1000 +++ b/tests/data/test1000 @@ -31,6 +31,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1003 b/tests/data/test1003 index 06cfbb61b0..4947d1dfb5 100644 --- a/tests/data/test1003 +++ b/tests/data/test1003 @@ -33,6 +33,9 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1005 b/tests/data/test1005 index 28af85f40e..8a036bb606 100644 --- a/tests/data/test1005 +++ b/tests/data/test1005 @@ -33,6 +33,9 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1006 b/tests/data/test1006 index 394b5563b3..004598ff13 100644 --- a/tests/data/test1006 +++ b/tests/data/test1006 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test101 b/tests/data/test101 index 3febc5e72a..8acbd21f7f 100644 --- a/tests/data/test101 +++ b/tests/data/test101 @@ -38,6 +38,9 @@ ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test1010 b/tests/data/test1010 index d45efdc8a5..cd03372935 100644 --- a/tests/data/test1010 +++ b/tests/data/test1010 @@ -42,6 +42,9 @@ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test102 b/tests/data/test102 index 7037986f46..151dd80252 100644 --- a/tests/data/test102 +++ b/tests/data/test102 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1028 b/tests/data/test1028 index 3e36597322..9592fb66fb 100644 --- a/tests/data/test1028 +++ b/tests/data/test1028 @@ -52,6 +52,9 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L # # Verify data after the test has been "shot" + +QUIT + GET /%TESTNUMBER0001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test103 b/tests/data/test103 index 52e5645bc0..66705310c5 100644 --- a/tests/data/test103 +++ b/tests/data/test103 @@ -33,6 +33,9 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P - # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test1036 b/tests/data/test1036 index f777a6ff7d..1343a8b7ce 100644 --- a/tests/data/test1036 +++ b/tests/data/test1036 @@ -40,6 +40,9 @@ This is the start!! # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1037 b/tests/data/test1037 index 18c9e5266a..967561b3b6 100644 --- a/tests/data/test1037 +++ b/tests/data/test1037 @@ -39,6 +39,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C - # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1038 b/tests/data/test1038 index c2e60a0a49..102d356152 100644 --- a/tests/data/test1038 +++ b/tests/data/test1038 @@ -34,6 +34,9 @@ worx? # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1039 b/tests/data/test1039 index a032c2f9ab..342290459b 100644 --- a/tests/data/test1039 +++ b/tests/data/test1039 @@ -34,6 +34,9 @@ worx? # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test104 b/tests/data/test104 index 3674f1da0a..f8d3d3eace 100644 --- a/tests/data/test104 +++ b/tests/data/test104 @@ -27,6 +27,9 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER --head # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1044 b/tests/data/test1044 index 471f099a3f..a0705d331c 100644 --- a/tests/data/test1044 +++ b/tests/data/test1044 @@ -38,6 +38,9 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1047 b/tests/data/test1047 index b863bd0061..b7d17275b3 100644 --- a/tests/data/test1047 +++ b/tests/data/test1047 @@ -43,6 +43,9 @@ ftp://%HOSTIP:%FTPPORT/ --interface %CLIENTIP # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1048 b/tests/data/test1048 index 600e11faf6..d2d2317bcf 100644 --- a/tests/data/test1048 +++ b/tests/data/test1048 @@ -52,6 +52,9 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENT6IP # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test105 b/tests/data/test105 index 2a26ac7eca..7f30529901 100644 --- a/tests/data/test105 +++ b/tests/data/test105 @@ -37,6 +37,9 @@ ftp://userdude:passfellow@%HOSTIP:%FTPPORT/%TESTNUMBER --use-ascii # Verify data after the test has been "shot" + +QUIT + USER userdude PASS passfellow diff --git a/tests/data/test1050 b/tests/data/test1050 index e6dd82a321..1a004967ce 100644 --- a/tests/data/test1050 +++ b/tests/data/test1050 @@ -47,6 +47,9 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENT6IP # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of EPRT that curl can send s/^(EPRT \|2\|::1\|)(.*)/$1/ diff --git a/tests/data/test1055 b/tests/data/test1055 index 2d1c604b4d..0624a969a7 100644 --- a/tests/data/test1055 +++ b/tests/data/test1055 @@ -54,6 +54,9 @@ the # # Verify data after the test has been "shot" + +QUIT + PUT /%TESTNUMBER HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test1057 b/tests/data/test1057 index a7cb3bc61e..e211dd7da3 100644 --- a/tests/data/test1057 +++ b/tests/data/test1057 @@ -36,6 +36,9 @@ FTP retrieve a byte-range relative to end of file # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test106 b/tests/data/test106 index b5e1e6929b..2fec634782 100644 --- a/tests/data/test106 +++ b/tests/data/test106 @@ -35,6 +35,9 @@ FTP GET with type=A style ASCII URL using %20 codes # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1062 b/tests/data/test1062 index 31a27a9473..36b726af81 100644 --- a/tests/data/test1062 +++ b/tests/data/test1062 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test107 b/tests/data/test107 index a741b7667f..a92a635f84 100644 --- a/tests/data/test107 +++ b/tests/data/test107 @@ -30,6 +30,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt # Verify data after the test has been "shot" + +QUIT + data to diff --git a/tests/data/test108 b/tests/data/test108 index 20ef6577ed..ceea4d4b25 100644 --- a/tests/data/test108 +++ b/tests/data/test108 @@ -31,6 +31,9 @@ Moooooooooooo # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test109 b/tests/data/test109 index d466437f21..63d1bc6b6a 100644 --- a/tests/data/test109 +++ b/tests/data/test109 @@ -31,6 +31,9 @@ Moooooooooooo # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1091 b/tests/data/test1091 index 445d31655f..b5006c6bc2 100644 --- a/tests/data/test1091 +++ b/tests/data/test1091 @@ -30,6 +30,9 @@ FTP URL with type=i # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1096 b/tests/data/test1096 index e7b1639247..f8eb1d4fb2 100644 --- a/tests/data/test1096 +++ b/tests/data/test1096 @@ -30,6 +30,9 @@ ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + 78 diff --git a/tests/data/test110 b/tests/data/test110 index e53fcd1377..c3c3d04bf7 100644 --- a/tests/data/test110 +++ b/tests/data/test110 @@ -36,6 +36,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 20 # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1102 b/tests/data/test1102 index 16994d9533..12822b95ae 100644 --- a/tests/data/test1102 +++ b/tests/data/test1102 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1103 b/tests/data/test1103 index a53b504bdc..2ceb89de03 100644 --- a/tests/data/test1103 +++ b/tests/data/test1103 @@ -33,6 +33,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1107 b/tests/data/test1107 index 8b31c76f83..de8b7d76e1 100644 --- a/tests/data/test1107 +++ b/tests/data/test1107 @@ -38,6 +38,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test111 b/tests/data/test111 index a46f7aef1d..a7cd3c3d27 100644 --- a/tests/data/test111 +++ b/tests/data/test111 @@ -29,6 +29,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 2000 # Verify data after the test has been "shot" + +QUIT + 36 diff --git a/tests/data/test1113 b/tests/data/test1113 index 8d10975ea0..c0e1230c35 100644 --- a/tests/data/test1113 +++ b/tests/data/test1113 @@ -36,6 +36,9 @@ FTP wildcard download - changed fnmatch, 2x perform (DOS LIST response) ############################################ # Verify data after the test has been "shot" + +QUIT + 0 diff --git a/tests/data/test112 b/tests/data/test112 index 41bbc025d9..231f3452fa 100644 --- a/tests/data/test112 +++ b/tests/data/test112 @@ -31,6 +31,9 @@ worx? # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1137 b/tests/data/test1137 index cb20aee313..4e8f24f090 100644 --- a/tests/data/test1137 +++ b/tests/data/test1137 @@ -38,6 +38,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ignore-content-length # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1149 b/tests/data/test1149 index d4e97d540d..4b3ba376e0 100644 --- a/tests/data/test1149 +++ b/tests/data/test1149 @@ -42,6 +42,9 @@ ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method multicwd --next # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test115 b/tests/data/test115 index 22f75c0b6e..e4da7ea1fa 100644 --- a/tests/data/test115 +++ b/tests/data/test115 @@ -29,6 +29,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + 13 diff --git a/tests/data/test1152 b/tests/data/test1152 index 1823bab4a9..6052b70b5e 100644 --- a/tests/data/test1152 +++ b/tests/data/test1152 @@ -45,6 +45,9 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1153 b/tests/data/test1153 index a74b1838ce..56ed840051 100644 --- a/tests/data/test1153 +++ b/tests/data/test1153 @@ -45,6 +45,9 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test116 b/tests/data/test116 index 0ab00aae91..cab67ad577 100644 --- a/tests/data/test116 +++ b/tests/data/test116 @@ -35,6 +35,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P 1.2.3.4 # Verify data after the test has been "shot" + +QUIT + 30 diff --git a/tests/data/test1162 b/tests/data/test1162 index b6b394139e..5aa706b7f9 100644 --- a/tests/data/test1162 +++ b/tests/data/test1162 @@ -37,6 +37,9 @@ MSYS2_ARG_CONV_EXCL=ftp:// + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1163 b/tests/data/test1163 index a109b511bc..09ede0cb87 100644 --- a/tests/data/test1163 +++ b/tests/data/test1163 @@ -33,6 +33,9 @@ FTP wildcard with pattern ending with an open-bracket + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test117 b/tests/data/test117 index 3bd5cb57f1..c292af7307 100644 --- a/tests/data/test117 +++ b/tests/data/test117 @@ -28,6 +28,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + 17 diff --git a/tests/data/test118 b/tests/data/test118 index 9b5b8708eb..de70121400 100644 --- a/tests/data/test118 +++ b/tests/data/test118 @@ -31,6 +31,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + 19 diff --git a/tests/data/test119 b/tests/data/test119 index 4426def0bd..2b36051f9d 100644 --- a/tests/data/test119 +++ b/tests/data/test119 @@ -30,6 +30,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - # Verify data after the test has been "shot" + +QUIT + 19 diff --git a/tests/data/test120 b/tests/data/test120 index 64628b6599..6e285b433f 100644 --- a/tests/data/test120 +++ b/tests/data/test120 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE file" # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1206 b/tests/data/test1206 index 228df4adb7..6abb0c5964 100644 --- a/tests/data/test1206 +++ b/tests/data/test1206 @@ -33,6 +33,9 @@ FTP PORT and 425 on download # Verify data after the test has been "shot" + +QUIT + s/^EPRT \|1\|(.*)/EPRT \|1\|/ diff --git a/tests/data/test1207 b/tests/data/test1207 index 612c42b0d6..e192e425eb 100644 --- a/tests/data/test1207 +++ b/tests/data/test1207 @@ -33,6 +33,9 @@ FTP PORT and 421 on download # Verify data after the test has been "shot" + +QUIT + s/^EPRT \|1\|(.*)/EPRT \|1\|/ diff --git a/tests/data/test121 b/tests/data/test121 index 3625d0e3e0..d9dfe2794d 100644 --- a/tests/data/test121 +++ b/tests/data/test121 @@ -35,6 +35,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE after_transfer" -Q "DELE before_tra # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1217 b/tests/data/test1217 index 691c88e732..47059b247a 100644 --- a/tests/data/test1217 +++ b/tests/data/test1217 @@ -32,6 +32,9 @@ ftp://%HOSTIP:%FTPPORT/get/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/get/file/agai # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test1219 b/tests/data/test1219 index 454654399b..b28077dcec 100644 --- a/tests/data/test1219 +++ b/tests/data/test1219 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + PWD EPSV diff --git a/tests/data/test122 b/tests/data/test122 index 1f007c1ce0..0566b24074 100644 --- a/tests/data/test122 +++ b/tests/data/test122 @@ -31,6 +31,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 5 # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1224 b/tests/data/test1224 index 64ba4482c5..61036cd085 100644 --- a/tests/data/test1224 +++ b/tests/data/test1224 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1225 b/tests/data/test1225 index b20363c3e4..39abfcb912 100644 --- a/tests/data/test1225 +++ b/tests/data/test1225 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT//foo/%TESTNUMBER ftp://%HOSTIP:%FTPPORT//foo/bar/%TESTNUM # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1226 b/tests/data/test1226 index 08e706b9b0..4ae0e6aff8 100644 --- a/tests/data/test1226 +++ b/tests/data/test1226 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method singlecwd # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1227 b/tests/data/test1227 index 30477a46a0..f8246fa466 100644 --- a/tests/data/test1227 +++ b/tests/data/test1227 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method nocwd # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test123 b/tests/data/test123 index 8ccd69cf68..1d29c8668f 100644 --- a/tests/data/test123 +++ b/tests/data/test123 @@ -28,6 +28,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 51 # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1233 b/tests/data/test1233 index 79e641d368..0ca5eed97f 100644 --- a/tests/data/test1233 +++ b/tests/data/test1233 @@ -32,6 +32,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test124 b/tests/data/test124 index d2717949c9..2dfc96bb8a 100644 --- a/tests/data/test124 +++ b/tests/data/test124 @@ -32,6 +32,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test125 b/tests/data/test125 index 8de97c14e5..a615d092fe 100644 --- a/tests/data/test125 +++ b/tests/data/test125 @@ -27,6 +27,9 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + 9 diff --git a/tests/data/test126 b/tests/data/test126 index b830fc7781..285618f111 100644 --- a/tests/data/test126 +++ b/tests/data/test126 @@ -32,6 +32,9 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1262 b/tests/data/test1262 index 0a7046ce93..2cb5d8857c 100644 --- a/tests/data/test1262 +++ b/tests/data/test1262 @@ -28,6 +28,9 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "-1 jan 2001" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test127 b/tests/data/test127 index ebf122d018..6871e0dc4e 100644 --- a/tests/data/test127 +++ b/tests/data/test127 @@ -29,6 +29,9 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER --disable-epsv # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test128 b/tests/data/test128 index 089717da79..d46f454efd 100644 --- a/tests/data/test128 +++ b/tests/data/test128 @@ -35,6 +35,9 @@ the # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test130 b/tests/data/test130 index 2c4dfe85eb..a0673dd8fe 100644 --- a/tests/data/test130 +++ b/tests/data/test130 @@ -50,6 +50,9 @@ default login userdef password passwddef # # Verify data after the test has been "shot" + +QUIT + USER user1 PASS passwd1 diff --git a/tests/data/test131 b/tests/data/test131 index 4a73de2850..0511520f73 100644 --- a/tests/data/test131 +++ b/tests/data/test131 @@ -47,6 +47,9 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" + +QUIT + USER user2 PASS passwd2 diff --git a/tests/data/test1316 b/tests/data/test1316 index 2218b6e147..c3f70878a7 100644 --- a/tests/data/test1316 +++ b/tests/data/test1316 @@ -60,6 +60,9 @@ ftp://ftp.%TESTNUMBER:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test132 b/tests/data/test132 index 77d47c8fd2..47748494bf 100644 --- a/tests/data/test132 +++ b/tests/data/test132 @@ -47,6 +47,9 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" + +QUIT + USER mary PASS mark diff --git a/tests/data/test133 b/tests/data/test133 index 4a2c46cde4..f80d840ab8 100644 --- a/tests/data/test133 +++ b/tests/data/test133 @@ -47,6 +47,9 @@ machine %HOSTIP login mary password drfrank # # Verify data after the test has been "shot" + +QUIT + USER mary PASS drfrank diff --git a/tests/data/test134 b/tests/data/test134 index 207e4f5d47..aa104bf15b 100644 --- a/tests/data/test134 +++ b/tests/data/test134 @@ -49,6 +49,9 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" + +QUIT + USER romulus PASS rhemus diff --git a/tests/data/test1348 b/tests/data/test1348 index 73cb473d97..e922246d07 100644 --- a/tests/data/test1348 +++ b/tests/data/test1348 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1349 b/tests/data/test1349 index 4451dc37ed..48f6f8b292 100644 --- a/tests/data/test1349 +++ b/tests/data/test1349 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test135 b/tests/data/test135 index 3dc1d531f5..cdb548362f 100644 --- a/tests/data/test135 +++ b/tests/data/test135 @@ -38,6 +38,9 @@ FTP retrieve a byte-range # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1350 b/tests/data/test1350 index 7f4b5a60fb..2ba80bd7a9 100644 --- a/tests/data/test1350 +++ b/tests/data/test1350 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1351 b/tests/data/test1351 index b876bbd35c..c7adcc8d71 100644 --- a/tests/data/test1351 +++ b/tests/data/test1351 @@ -38,6 +38,9 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1352 b/tests/data/test1352 index 53689b6a77..10fa85d81e 100644 --- a/tests/data/test1352 +++ b/tests/data/test1352 @@ -38,6 +38,9 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1353 b/tests/data/test1353 index be501618cb..c1764b7fe1 100644 --- a/tests/data/test1353 +++ b/tests/data/test1353 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1354 b/tests/data/test1354 index ba5cba780d..42b7449a54 100644 --- a/tests/data/test1354 +++ b/tests/data/test1354 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1355 b/tests/data/test1355 index 32c9d8baf2..677dc839d6 100644 --- a/tests/data/test1355 +++ b/tests/data/test1355 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1356 b/tests/data/test1356 index 2a156628da..b5f28bee5b 100644 --- a/tests/data/test1356 +++ b/tests/data/test1356 @@ -48,6 +48,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1357 b/tests/data/test1357 index 371d8c6191..c273085704 100644 --- a/tests/data/test1357 +++ b/tests/data/test1357 @@ -48,6 +48,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1358 b/tests/data/test1358 index bd0b382a8d..495d93961b 100644 --- a/tests/data/test1358 +++ b/tests/data/test1358 @@ -48,6 +48,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1359 b/tests/data/test1359 index bc29dd8c8c..38ebef0134 100644 --- a/tests/data/test1359 +++ b/tests/data/test1359 @@ -49,6 +49,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test136 b/tests/data/test136 index ef0b2c49ac..f71f4b36ad 100644 --- a/tests/data/test136 +++ b/tests/data/test136 @@ -28,6 +28,9 @@ FTP with user and no password # Verify data after the test has been "shot" + +QUIT + USER user PASS diff --git a/tests/data/test1360 b/tests/data/test1360 index 70e8053bae..a1e6b3ec1d 100644 --- a/tests/data/test1360 +++ b/tests/data/test1360 @@ -49,6 +49,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1361 b/tests/data/test1361 index 6b9c566a75..20a014143c 100644 --- a/tests/data/test1361 +++ b/tests/data/test1361 @@ -48,6 +48,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1362 b/tests/data/test1362 index 41f7b4dfa0..0e4689da49 100644 --- a/tests/data/test1362 +++ b/tests/data/test1362 @@ -48,6 +48,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1363 b/tests/data/test1363 index e5344f045f..dc1046d007 100644 --- a/tests/data/test1363 +++ b/tests/data/test1363 @@ -48,6 +48,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test137 b/tests/data/test137 index 33b93589ec..8154af88df 100644 --- a/tests/data/test137 +++ b/tests/data/test137 @@ -31,6 +31,9 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1378 b/tests/data/test1378 index 7348a3f175..81c18731d8 100644 --- a/tests/data/test1378 +++ b/tests/data/test1378 @@ -32,6 +32,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1379 b/tests/data/test1379 index 0b8d20ae0c..c11dfe84c8 100644 --- a/tests/data/test1379 +++ b/tests/data/test1379 @@ -32,6 +32,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test138 b/tests/data/test138 index db3b6ec7df..e00c3110ca 100644 --- a/tests/data/test138 +++ b/tests/data/test138 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1380 b/tests/data/test1380 index 187dd8cdbb..2016b4558a 100644 --- a/tests/data/test1380 +++ b/tests/data/test1380 @@ -32,6 +32,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1381 b/tests/data/test1381 index 4ba20eb3e6..404a03d0d8 100644 --- a/tests/data/test1381 +++ b/tests/data/test1381 @@ -33,6 +33,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1382 b/tests/data/test1382 index 26ff7acbe8..d0b04904d2 100644 --- a/tests/data/test1382 +++ b/tests/data/test1382 @@ -33,6 +33,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1383 b/tests/data/test1383 index d4c5c8285a..f0c9cd68e2 100644 --- a/tests/data/test1383 +++ b/tests/data/test1383 @@ -32,6 +32,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1384 b/tests/data/test1384 index af7afdf766..4d2fed963d 100644 --- a/tests/data/test1384 +++ b/tests/data/test1384 @@ -32,6 +32,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1385 b/tests/data/test1385 index d2038ee920..f0904607a9 100644 --- a/tests/data/test1385 +++ b/tests/data/test1385 @@ -32,6 +32,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1386 b/tests/data/test1386 index 0aaf664194..2e3d73a92b 100644 --- a/tests/data/test1386 +++ b/tests/data/test1386 @@ -40,6 +40,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBE # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1387 b/tests/data/test1387 index 0f124d870c..2965acea4d 100644 --- a/tests/data/test1387 +++ b/tests/data/test1387 @@ -40,6 +40,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBE # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1388 b/tests/data/test1388 index d78844e77e..0078916be5 100644 --- a/tests/data/test1388 +++ b/tests/data/test1388 @@ -40,6 +40,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBE # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1389 b/tests/data/test1389 index 0863a40139..3ce9acf11c 100644 --- a/tests/data/test1389 +++ b/tests/data/test1389 @@ -41,6 +41,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBE # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test139 b/tests/data/test139 index 160f628e2c..61a0da601a 100644 --- a/tests/data/test139 +++ b/tests/data/test139 @@ -31,6 +31,9 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 1989" # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1390 b/tests/data/test1390 index a856d1e8d6..09dafdd7b4 100644 --- a/tests/data/test1390 +++ b/tests/data/test1390 @@ -41,6 +41,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBE # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1391 b/tests/data/test1391 index ae1495eec9..4f612f99ee 100644 --- a/tests/data/test1391 +++ b/tests/data/test1391 @@ -40,6 +40,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBE # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1392 b/tests/data/test1392 index f715fe8b3c..656f03c552 100644 --- a/tests/data/test1392 +++ b/tests/data/test1392 @@ -40,6 +40,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBE # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1393 b/tests/data/test1393 index dc7a6f9341..4d6d348fe5 100644 --- a/tests/data/test1393 +++ b/tests/data/test1393 @@ -40,6 +40,9 @@ perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBE # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test140 b/tests/data/test140 index 5e29f5c7c7..cacef2ae20 100644 --- a/tests/data/test140 +++ b/tests/data/test140 @@ -30,6 +30,9 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 2004" # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1405 b/tests/data/test1405 index 8a13a688aa..5ca006a13f 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -42,6 +42,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FA # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test141 b/tests/data/test141 index 425a98f2a6..5ffbc45235 100644 --- a/tests/data/test141 +++ b/tests/data/test141 @@ -32,6 +32,9 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1414 b/tests/data/test1414 index 4be9b54222..9fc2a56ffa 100644 --- a/tests/data/test1414 +++ b/tests/data/test1414 @@ -38,6 +38,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - # Verify data after the test has been "shot" + +QUIT + s/^(EPRT \|1\|)(.*)/$1/ s/^(PORT)(.*)/$1/ diff --git a/tests/data/test142 b/tests/data/test142 index c4ad11a6d8..db17e3074e 100644 --- a/tests/data/test142 +++ b/tests/data/test142 @@ -26,6 +26,9 @@ ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/par # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test143 b/tests/data/test143 index ed89e70dec..8984a3f1f6 100644 --- a/tests/data/test143 +++ b/tests/data/test143 @@ -28,6 +28,9 @@ FTP URL with type=a # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test144 b/tests/data/test144 index be2ca5c8c5..e7a983bcad 100644 --- a/tests/data/test144 +++ b/tests/data/test144 @@ -31,6 +31,9 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test1444 b/tests/data/test1444 index 61b3a29f4c..f50c734f0c 100644 --- a/tests/data/test1444 +++ b/tests/data/test1444 @@ -37,6 +37,9 @@ perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 1234567890)' # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1449 b/tests/data/test1449 index 0b9de0192c..d761f3c0e7 100644 --- a/tests/data/test1449 +++ b/tests/data/test1449 @@ -27,6 +27,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -r 36893488147419103232- # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test145 b/tests/data/test145 index 53f3f631d7..7f12b36f36 100644 --- a/tests/data/test145 +++ b/tests/data/test145 @@ -30,6 +30,9 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l # Verify data after the test has been "shot" + +QUIT + 19 diff --git a/tests/data/test146 b/tests/data/test146 index 803fbfc4d7..c7586573e4 100644 --- a/tests/data/test146 +++ b/tests/data/test146 @@ -29,6 +29,9 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNU # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test147 b/tests/data/test147 index 769043d489..b2772f607d 100644 --- a/tests/data/test147 +++ b/tests/data/test147 @@ -31,6 +31,9 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER --ftp-create-dirs # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test148 b/tests/data/test148 index 051d31a9de..c8ec7a6d18 100644 --- a/tests/data/test148 +++ b/tests/data/test148 @@ -28,6 +28,9 @@ ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/%TESTNUMBER --ftp-create-dirs # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test149 b/tests/data/test149 index 404922b296..60d9089ae7 100644 --- a/tests/data/test149 +++ b/tests/data/test149 @@ -27,6 +27,9 @@ send away this contents # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test1501 b/tests/data/test1501 index 195c17998c..070ff7d97a 100644 --- a/tests/data/test1501 +++ b/tests/data/test1501 @@ -39,6 +39,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ # Verify data after the test has been "shot" + +QUIT + 0 diff --git a/tests/data/test1569 b/tests/data/test1569 index 159a813919..24f16ee788 100644 --- a/tests/data/test1569 +++ b/tests/data/test1569 @@ -40,6 +40,9 @@ lib%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1570 b/tests/data/test1570 index 713ab5ea77..e558b9bc32 100644 --- a/tests/data/test1570 +++ b/tests/data/test1570 @@ -40,6 +40,9 @@ lib1569 # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test1631 b/tests/data/test1631 index 83bc83e42e..f624c41426 100644 --- a/tests/data/test1631 +++ b/tests/data/test1631 @@ -53,6 +53,9 @@ proxy # Verify data after the test has been "shot" + +QUIT + # The second CONNECT will be made to the dynamic port number the FTP server # opens for us, so we can't compare with a known pre-existing number! diff --git a/tests/data/test1632 b/tests/data/test1632 index 18674d21ba..919f2c5282 100644 --- a/tests/data/test1632 +++ b/tests/data/test1632 @@ -62,6 +62,9 @@ proxy # Verify data after the test has been "shot" + +QUIT + # The second and third CONNECT will be made to the dynamic port number the FTP # server opens for us, so we can't compare with known pre-existing numbers! diff --git a/tests/data/test182 b/tests/data/test182 index cb1e4f0c20..b49f10f85e 100644 --- a/tests/data/test182 +++ b/tests/data/test182 @@ -29,6 +29,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test191 b/tests/data/test191 index 0293693631..749a34ec98 100644 --- a/tests/data/test191 +++ b/tests/data/test191 @@ -27,6 +27,9 @@ FTP URL with ?-letters in username and password # Verify data after the test has been "shot" + +QUIT + USER use?r PASS pass?word diff --git a/tests/data/test2000 b/tests/data/test2000 index 032bf5b1b4..ee2e507349 100644 --- a/tests/data/test2000 +++ b/tests/data/test2000 @@ -46,6 +46,9 @@ moo # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test2001 b/tests/data/test2001 index de16735313..39eb1ff9dd 100644 --- a/tests/data/test2001 +++ b/tests/data/test2001 @@ -63,6 +63,9 @@ moo # # Verify data after the test has been "shot" + +QUIT + GET /%TESTNUMBER0001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2002 b/tests/data/test2002 index 4b2b4fef69..7a581a5cbb 100644 --- a/tests/data/test2002 +++ b/tests/data/test2002 @@ -73,6 +73,9 @@ moo # Verify data after the test has been "shot" +QUIT + + ^timeout = [5-6]$ diff --git a/tests/data/test2003 b/tests/data/test2003 index dcd8621789..2475bbe327 100644 --- a/tests/data/test2003 +++ b/tests/data/test2003 @@ -73,6 +73,9 @@ moo # Verify data after the test has been "shot" +QUIT + + ^timeout = [5-6]$ diff --git a/tests/data/test2039 b/tests/data/test2039 index 7cab984ce5..05f23ab743 100644 --- a/tests/data/test2039 +++ b/tests/data/test2039 @@ -48,6 +48,9 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" + +QUIT + USER userdef PASS passwddef diff --git a/tests/data/test210 b/tests/data/test210 index 1ee313d76a..c4ccb6b2c3 100644 --- a/tests/data/test210 +++ b/tests/data/test210 @@ -33,6 +33,9 @@ data blobb # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test211 b/tests/data/test211 index 6830727ab6..01dcad0eea 100644 --- a/tests/data/test211 +++ b/tests/data/test211 @@ -34,6 +34,9 @@ data blobb # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test212 b/tests/data/test212 index 045ad3769a..a16bf42113 100644 --- a/tests/data/test212 +++ b/tests/data/test212 @@ -39,6 +39,9 @@ data blobb # Verify data after the test has been "shot" + +QUIT + # Strip the addresses and port number but leave the rest s/^(EPRT \|1\|)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|/$1/ diff --git a/tests/data/test215 b/tests/data/test215 index 058639f272..d2ba2c702f 100644 --- a/tests/data/test215 +++ b/tests/data/test215 @@ -38,6 +38,9 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNU # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test216 b/tests/data/test216 index 1be87c0d1e..a0ec72be1e 100644 --- a/tests/data/test216 +++ b/tests/data/test216 @@ -27,6 +27,9 @@ upload this file twice # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test227 b/tests/data/test227 index f7b445185d..bf55fdd6c6 100644 --- a/tests/data/test227 +++ b/tests/data/test227 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FA # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test228 b/tests/data/test228 index 8e7d73ff0c..ae19b534b0 100644 --- a/tests/data/test228 +++ b/tests/data/test228 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count" # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test235 b/tests/data/test235 index 4bfe7497ea..485be98ecf 100644 --- a/tests/data/test235 +++ b/tests/data/test235 @@ -32,6 +32,9 @@ worx? # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test236 b/tests/data/test236 index a66fa046d9..13493f26a5 100644 --- a/tests/data/test236 +++ b/tests/data/test236 @@ -33,6 +33,9 @@ Test data # Verify data after the test has been "shot" + +QUIT + USER anonymous diff --git a/tests/data/test238 b/tests/data/test238 index 3c0db04413..71b46ddc36 100644 --- a/tests/data/test238 +++ b/tests/data/test238 @@ -27,6 +27,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + # 13 = CURLE_FTP_WEIRD_PASV_REPLY 13 diff --git a/tests/data/test244 b/tests/data/test244 index 782be2be40..ad9cf4fe2d 100644 --- a/tests/data/test244 +++ b/tests/data/test244 @@ -41,6 +41,9 @@ FTP dir listing with nocwd and URL encoded path # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test247 b/tests/data/test247 index 40f42e7d06..5eade37b30 100644 --- a/tests/data/test247 +++ b/tests/data/test247 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 # Verify data after the test has been "shot" + +QUIT + diff --git a/tests/data/test248 b/tests/data/test248 index 097e1e5839..2d5c845bae 100644 --- a/tests/data/test248 +++ b/tests/data/test248 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 # Verify data after the test has been "shot" + +QUIT + data to diff --git a/tests/data/test250 b/tests/data/test250 index 4f01ea79a3..59f7fa3115 100644 --- a/tests/data/test250 +++ b/tests/data/test250 @@ -46,6 +46,9 @@ ftp://%HOSTIP:%FTPPORT/ # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test251 b/tests/data/test251 index 9ed8c94880..6de2003c8f 100644 --- a/tests/data/test251 +++ b/tests/data/test251 @@ -41,6 +41,9 @@ ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test252 b/tests/data/test252 index 1480ee1ec1..35c3014a0b 100644 --- a/tests/data/test252 +++ b/tests/data/test252 @@ -45,6 +45,9 @@ FTP IPv6 dir list PASV # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test253 b/tests/data/test253 index 01ec416ac6..8f7192d21b 100644 --- a/tests/data/test253 +++ b/tests/data/test253 @@ -45,6 +45,9 @@ FTP IPv6 dir list with EPRT # # Verify data after the test has been "shot" + +QUIT + s/^(EPRT \|2\|::1\|)(.*)/$1/ diff --git a/tests/data/test254 b/tests/data/test254 index 90b58a0b30..ede445355a 100644 --- a/tests/data/test254 +++ b/tests/data/test254 @@ -46,6 +46,9 @@ FTP IPv6 dir list PASV and --disable-epsv # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test255 b/tests/data/test255 index 1a1526a10c..190908e350 100644 --- a/tests/data/test255 +++ b/tests/data/test255 @@ -46,6 +46,9 @@ FTP IPv6 dir list with EPRT and --disable-eprt # # Verify data after the test has been "shot" + +QUIT + s/^(EPRT \|2\|::1\|)(.*)/$1/ diff --git a/tests/data/test261 b/tests/data/test261 index d5f940372e..192b2bcd7d 100644 --- a/tests/data/test261 +++ b/tests/data/test261 @@ -34,6 +34,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test270 b/tests/data/test270 index efa183f155..f4f5a02316 100644 --- a/tests/data/test270 +++ b/tests/data/test270 @@ -36,6 +36,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-skip-pasv-ip --disable-epsv # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test272 b/tests/data/test272 index 2857c3eac3..5607a10816 100644 --- a/tests/data/test272 +++ b/tests/data/test272 @@ -29,6 +29,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -z "2004 jan 1 12:12:12 UTC" # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test280 b/tests/data/test280 index 1aee4b517f..dbe809e1da 100644 --- a/tests/data/test280 +++ b/tests/data/test280 @@ -46,6 +46,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-alternative-to-user "USER replacement" # # Verify data after the test has been "shot" + +QUIT + USER anonymous USER replacement diff --git a/tests/data/test290 b/tests/data/test290 index e7048a5384..6ffa9a7261 100644 --- a/tests/data/test290 +++ b/tests/data/test290 @@ -27,6 +27,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 30 # Verify data after the test has been "shot" + +QUIT + 63 diff --git a/tests/data/test291 b/tests/data/test291 index 05cc2b444a..2385f7db4f 100644 --- a/tests/data/test291 +++ b/tests/data/test291 @@ -33,6 +33,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 100 # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test294 b/tests/data/test294 index 67108aedb9..4e2e9857d1 100644 --- a/tests/data/test294 +++ b/tests/data/test294 @@ -47,6 +47,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-account "data for acct" # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test296 b/tests/data/test296 index c88ec99bf7..d4b87dfa4f 100644 --- a/tests/data/test296 +++ b/tests/data/test296 @@ -31,6 +31,9 @@ FTP CWD with --ftp-method multicwd # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test297 b/tests/data/test297 index 99c10d3e13..d982a3b7f5 100644 --- a/tests/data/test297 +++ b/tests/data/test297 @@ -31,6 +31,9 @@ FTP CWD with --ftp-method singlecwd # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test298 b/tests/data/test298 index 5188c85477..3880a60732 100644 --- a/tests/data/test298 +++ b/tests/data/test298 @@ -31,6 +31,9 @@ FTP CWD with --ftp-method nocwd # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test3027 b/tests/data/test3027 index 05a811f4e8..416c0079db 100644 --- a/tests/data/test3027 +++ b/tests/data/test3027 @@ -40,6 +40,9 @@ data blobb # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test336 b/tests/data/test336 index f50b42adb3..4e881379a0 100644 --- a/tests/data/test336 +++ b/tests/data/test336 @@ -41,6 +41,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6 # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test337 b/tests/data/test337 index d44a712fbb..b82f947868 100644 --- a/tests/data/test337 +++ b/tests/data/test337 @@ -41,6 +41,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6 # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test348 b/tests/data/test348 index 55e9d608dd..988e5bd049 100644 --- a/tests/data/test348 +++ b/tests/data/test348 @@ -36,6 +36,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt # Verify data after the test has been "shot" + +QUIT + data to diff --git a/tests/data/test350 b/tests/data/test350 index 3eb8b80aa6..7342275d45 100644 --- a/tests/data/test350 +++ b/tests/data/test350 @@ -41,6 +41,9 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method multicwd # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test351 b/tests/data/test351 index ffa93e3e29..31c07fa3c9 100644 --- a/tests/data/test351 +++ b/tests/data/test351 @@ -41,6 +41,9 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method nocwd # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test352 b/tests/data/test352 index 0cc4d69fd1..d54ab60ebf 100644 --- a/tests/data/test352 +++ b/tests/data/test352 @@ -41,6 +41,9 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method singlecwd # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test353 b/tests/data/test353 index a94828bd6b..dedd06960b 100644 --- a/tests/data/test353 +++ b/tests/data/test353 @@ -41,6 +41,9 @@ ftp://%HOSTIP:%FTPPORT/ --ftp-method singlecwd # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test354 b/tests/data/test354 index dc6d732d8b..9a40d49c61 100644 --- a/tests/data/test354 +++ b/tests/data/test354 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PWD diff --git a/tests/data/test362 b/tests/data/test362 index e8ce9731ed..d259593fd8 100644 --- a/tests/data/test362 +++ b/tests/data/test362 @@ -29,6 +29,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --continue-at + +QUIT + data to diff --git a/tests/data/test380 b/tests/data/test380 index f9ccafdabc..47676e3dd8 100644 --- a/tests/data/test380 +++ b/tests/data/test380 @@ -48,6 +48,9 @@ machine %HOSTIP login mary password yram # # Verify data after the test has been "shot" + +QUIT + USER mary PASS yram diff --git a/tests/data/test381 b/tests/data/test381 index 41b9eb779c..bf28773024 100644 --- a/tests/data/test381 +++ b/tests/data/test381 @@ -52,6 +52,9 @@ machine %HOSTIP login mary password yram # # Verify data after the test has been "shot" + +QUIT + USER mary PASS drfrank diff --git a/tests/data/test416 b/tests/data/test416 index b6b10b3df2..f50ad70dda 100644 --- a/tests/data/test416 +++ b/tests/data/test416 @@ -38,6 +38,9 @@ FTP growing file support # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test494 b/tests/data/test494 index 648318729d..c089d75c77 100644 --- a/tests/data/test494 +++ b/tests/data/test494 @@ -46,6 +46,9 @@ machine %HOSTIP login user1 password passwd1 # # Verify data after the test has been "shot" + +QUIT + USER user1 PASS passwd1 diff --git a/tests/data/test505 b/tests/data/test505 index 6eba48936f..aa26ccb5f9 100644 --- a/tests/data/test505 +++ b/tests/data/test505 @@ -40,6 +40,9 @@ works? # Verify data after the test has been "shot" + +QUIT + Contents of diff --git a/tests/data/test511 b/tests/data/test511 index adcabe8bda..7637dceded 100644 --- a/tests/data/test511 +++ b/tests/data/test511 @@ -35,6 +35,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" + +QUIT + # CURLE_REMOTE_FILE_NOT_FOUND 78 diff --git a/tests/data/test520 b/tests/data/test520 index 6a27bb3f8e..17d89199bf 100644 --- a/tests/data/test520 +++ b/tests/data/test520 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/520 # # Verify data after the test has been "shot" + +QUIT + USER anonymous diff --git a/tests/data/test521 b/tests/data/test521 index 90473b33a0..eaeb040d32 100644 --- a/tests/data/test521 +++ b/tests/data/test521 @@ -44,6 +44,9 @@ ftp://%HOSTIP/%TESTNUMBER/ %FTPPORT # # Verify data after the test has been "shot" + +QUIT + USER xxx PASS yyy diff --git a/tests/data/test525 b/tests/data/test525 index 2b96a7fd96..82a85276fe 100644 --- a/tests/data/test525 +++ b/tests/data/test525 @@ -36,6 +36,9 @@ Moooooooooooo # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test526 b/tests/data/test526 index 85b24d5db9..3a303e9a00 100644 --- a/tests/data/test526 +++ b/tests/data/test526 @@ -39,6 +39,9 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test527 b/tests/data/test527 index 85b24d5db9..3a303e9a00 100644 --- a/tests/data/test527 +++ b/tests/data/test527 @@ -39,6 +39,9 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test529 b/tests/data/test529 index 737e5018f9..c92b377ef7 100644 --- a/tests/data/test529 +++ b/tests/data/test529 @@ -36,6 +36,9 @@ Moooooooooooo # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test531 b/tests/data/test531 index 59501d5ead..33739ea7eb 100644 --- a/tests/data/test531 +++ b/tests/data/test531 @@ -39,6 +39,9 @@ don't upload this # Verify data after the test has been "shot" + +QUIT + # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test532 b/tests/data/test532 index c1d3b0b0c8..128b2d8802 100644 --- a/tests/data/test532 +++ b/tests/data/test532 @@ -39,6 +39,9 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test533 b/tests/data/test533 index 1dbceb6dd3..f6467acaa6 100644 --- a/tests/data/test533 +++ b/tests/data/test533 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test534 b/tests/data/test534 index 0e0f35abdd..87b98b5e79 100644 --- a/tests/data/test534 +++ b/tests/data/test534 @@ -38,6 +38,9 @@ ftp://non-existing-host.haxx.se/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TE # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test539 b/tests/data/test539 index 7985a52347..b774ead0bb 100644 --- a/tests/data/test539 +++ b/tests/data/test539 @@ -43,6 +43,9 @@ ftp://%HOSTIP:%FTPPORT/path/to/the/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/ # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test541 b/tests/data/test541 index c0677d8ea9..9492d0854e 100644 --- a/tests/data/test541 +++ b/tests/data/test541 @@ -40,6 +40,9 @@ works? # Verify data after the test has been "shot" + +QUIT + diff --git a/tests/data/test542 b/tests/data/test542 index b39b1b30d1..4a412c8bf9 100644 --- a/tests/data/test542 +++ b/tests/data/test542 @@ -44,6 +44,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # There's no MTDM in the protocol here since this code doesn't ask for the # time/date of the file + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test546 b/tests/data/test546 index f8f01641a0..6021b67581 100644 --- a/tests/data/test546 +++ b/tests/data/test546 @@ -44,6 +44,9 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test562 b/tests/data/test562 index d1793891d0..c2cf2546ca 100644 --- a/tests/data/test562 +++ b/tests/data/test562 @@ -39,6 +39,9 @@ FTP a type=A URL and CURLOPT_PORT set # There's no MTDM in the protocol here since this code doesn't ask for the # time/date of the file + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test564 b/tests/data/test564 index 96a6f9b1a6..3b0a2ae1ed 100644 --- a/tests/data/test564 +++ b/tests/data/test564 @@ -45,6 +45,9 @@ proxy # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test574 b/tests/data/test574 index 3c151286c8..50d2120f04 100644 --- a/tests/data/test574 +++ b/tests/data/test574 @@ -33,6 +33,9 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*.txt ############################################ # Verify data after the test has been "shot" + +QUIT + 0 diff --git a/tests/data/test575 b/tests/data/test575 index d51c5a08d5..35b65a3d6f 100644 --- a/tests/data/test575 +++ b/tests/data/test575 @@ -32,6 +32,9 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/* # Verify data after the test has been "shot" + +QUIT + 0 diff --git a/tests/data/test586 b/tests/data/test586 index b17a702a6b..a708f3b595 100644 --- a/tests/data/test586 +++ b/tests/data/test586 @@ -45,6 +45,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test588 b/tests/data/test588 index 9c8c5f3202..d41131c423 100644 --- a/tests/data/test588 +++ b/tests/data/test588 @@ -45,6 +45,9 @@ Moooooooooooo # Verify data after the test has been "shot" + +QUIT + # Strip off parts of the PORT and EPRT commands that might differ s/^PORT (.*)/PORT/ diff --git a/tests/data/test591 b/tests/data/test591 index d1cbf082a4..10d12ca263 100644 --- a/tests/data/test591 +++ b/tests/data/test591 @@ -47,6 +47,9 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" + +QUIT + # Strip off parts of the PORT and EPRT commands that might differ s/^PORT (.*)/PORT/ diff --git a/tests/data/test592 b/tests/data/test592 index f77eb9a870..a6fbaf72b5 100644 --- a/tests/data/test592 +++ b/tests/data/test592 @@ -47,6 +47,9 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" + +QUIT + # Strip off parts of the PORT and EPRT commands that might differ s/^PORT (.*)/PORT/ diff --git a/tests/data/test593 b/tests/data/test593 index 9a15a5184e..5c3bdf35fe 100644 --- a/tests/data/test593 +++ b/tests/data/test593 @@ -47,6 +47,9 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" + +QUIT + # Strip off parts of the PORT and EPRT commands that might differ s/^PORT (.*)/PORT/ diff --git a/tests/data/test594 b/tests/data/test594 index cd98f0b9d8..e0dfc56e35 100644 --- a/tests/data/test594 +++ b/tests/data/test594 @@ -49,6 +49,9 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" + +QUIT + # Strip off parts of the PORT and EPRT commands that might differ s/^PORT (.*)/PORT/ diff --git a/tests/data/test595 b/tests/data/test595 index 40ace13d5e..13d6bb927d 100644 --- a/tests/data/test595 +++ b/tests/data/test595 @@ -43,6 +43,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test596 b/tests/data/test596 index 7175c63f8a..30e401df7a 100644 --- a/tests/data/test596 +++ b/tests/data/test596 @@ -43,6 +43,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER activeftp # # Verify data after the test has been "shot" + +QUIT + s/^(EPRT \|1\|)(.*)/$1/ diff --git a/tests/data/test661 b/tests/data/test661 index 5965bd8aea..799d51e2d5 100644 --- a/tests/data/test661 +++ b/tests/data/test661 @@ -33,6 +33,9 @@ ftp://%HOSTIP:%FTPPORT/ # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test706 b/tests/data/test706 index faafd90385..8fbb24ba55 100644 --- a/tests/data/test706 +++ b/tests/data/test706 @@ -47,6 +47,9 @@ FTP dir list PASV via SOCKS4 # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test707 b/tests/data/test707 index 2c41dfea70..f22b2010ee 100644 --- a/tests/data/test707 +++ b/tests/data/test707 @@ -47,6 +47,9 @@ FTP dir list PASV via SOCKS5 # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test711 b/tests/data/test711 index 355ca0e51e..288fcc1df4 100644 --- a/tests/data/test711 +++ b/tests/data/test711 @@ -43,6 +43,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test712 b/tests/data/test712 index 7bcc2a1bbb..ef64b3f5bc 100644 --- a/tests/data/test712 +++ b/tests/data/test712 @@ -37,6 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test713 b/tests/data/test713 index 44820a78ff..81374027fe 100644 --- a/tests/data/test713 +++ b/tests/data/test713 @@ -38,6 +38,9 @@ ftp://ftp.example.com/%TESTNUMBER --connect-to ::%HOSTIP:%FTPPORT --proxy socks5 # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test714 b/tests/data/test714 index a38400bb80..6414188e6f 100644 --- a/tests/data/test714 +++ b/tests/data/test714 @@ -57,6 +57,9 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test715 b/tests/data/test715 index 6f9670af54..e931e0d608 100644 --- a/tests/data/test715 +++ b/tests/data/test715 @@ -59,6 +59,9 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com # # Verify data after the test has been "shot" + +QUIT + USER anonymous PASS ftp@example.com diff --git a/tests/data/test973 b/tests/data/test973 index 17748ea735..2961ce7c34 100644 --- a/tests/data/test973 +++ b/tests/data/test973 @@ -66,6 +66,9 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u joe:secret # # Verify data after the test has been "shot" + +QUIT + GET /%TESTNUMBER HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test975 b/tests/data/test975 index 33f2559c6f..ea44052635 100644 --- a/tests/data/test975 +++ b/tests/data/test975 @@ -66,6 +66,9 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --location-trusted -u joe:secret # # Verify data after the test has been "shot" + +QUIT + GET /%TESTNUMBER HTTP/1.1 Host: %HOSTIP:%HTTPPORT