diff options
Diffstat (limited to 'tests')
234 files changed, 218 insertions, 724 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index d0696da3d..9d1fcbb75 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -108,7 +108,8 @@ test718 test719 test720 test721 test722 test723 test724 test725 test726 \ test727 test728 test729 test730 test731 test732 test733 test734 test735 \ test736 test737 test738 test739 test740 test741 test742 test743 test744 \ test745 test746 test747 test748 test749 test750 test751 test752 test753 \ -test754 test755 test756 test757 test758 test759 test760 \ +test754 test755 test756 test757 test758 test759 test760 test761 test762 \ +\ test780 test781 test782 test783 test784 test785 test786 test787 test788 \ test789 test790 test791 test792 test793 test794 test795 test796 test797 \ \ diff --git a/tests/data/test100 b/tests/data/test100 index 54d31744b..b7554383e 100644 --- a/tests/data/test100 +++ b/tests/data/test100 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1000 b/tests/data/test1000 index e102a006e..fe94010ac 100644 --- a/tests/data/test1000 +++ b/tests/data/test1000 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1003 b/tests/data/test1003 index 4947d1dfb..06cfbb61b 100644 --- a/tests/data/test1003 +++ b/tests/data/test1003 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1005 b/tests/data/test1005 index 8a036bb60..28af85f40 100644 --- a/tests/data/test1005 +++ b/tests/data/test1005 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1006 b/tests/data/test1006 index a8da3f73b..b3d093672 100644 --- a/tests/data/test1006 +++ b/tests/data/test1006 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test101 b/tests/data/test101 index 8acbd21f7..3febc5e72 100644 --- a/tests/data/test101 +++ b/tests/data/test101 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 cd0337293..d45efdc8a 100644 --- a/tests/data/test1010 +++ b/tests/data/test1010 @@ -42,9 +42,6 @@ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test102 b/tests/data/test102 index 151dd8025..7037986f4 100644 --- a/tests/data/test102 +++ b/tests/data/test102 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1028 b/tests/data/test1028 index 9592fb66f..3e3659732 100644 --- a/tests/data/test1028 +++ b/tests/data/test1028 @@ -52,9 +52,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> GET /%TESTNUMBER0001 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
diff --git a/tests/data/test103 b/tests/data/test103 index 66705310c..52e5645bc 100644 --- a/tests/data/test103 +++ b/tests/data/test103 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P - # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 1343a8b7c..f777a6ff7 100644 --- a/tests/data/test1036 +++ b/tests/data/test1036 @@ -40,9 +40,6 @@ This is the start!! # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1037 b/tests/data/test1037 index 967561b3b..18c9e5266 100644 --- a/tests/data/test1037 +++ b/tests/data/test1037 @@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C - # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1038 b/tests/data/test1038 index 102d35615..c2e60a0a4 100644 --- a/tests/data/test1038 +++ b/tests/data/test1038 @@ -34,9 +34,6 @@ worx? # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1039 b/tests/data/test1039 index 342290459..a032c2f9a 100644 --- a/tests/data/test1039 +++ b/tests/data/test1039 @@ -34,9 +34,6 @@ worx? # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test104 b/tests/data/test104 index f8d3d3eac..3674f1da0 100644 --- a/tests/data/test104 +++ b/tests/data/test104 @@ -27,9 +27,6 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER --head # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1044 b/tests/data/test1044 index a0705d331..471f099a3 100644 --- a/tests/data/test1044 +++ b/tests/data/test1044 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1047 b/tests/data/test1047 index b7d17275b..b863bd006 100644 --- a/tests/data/test1047 +++ b/tests/data/test1047 @@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/ --interface %CLIENTIP # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1048 b/tests/data/test1048 index 5aed75a37..cf90020fe 100644 --- a/tests/data/test1048 +++ b/tests/data/test1048 @@ -48,9 +48,6 @@ FTP-IPv6 dir list PASV with localhost --interface # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test105 b/tests/data/test105 index 7f3052990..2a26ac7ec 100644 --- a/tests/data/test105 +++ b/tests/data/test105 @@ -37,9 +37,6 @@ ftp://userdude:passfellow@%HOSTIP:%FTPPORT/%TESTNUMBER --use-ascii # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER userdude
PASS passfellow
diff --git a/tests/data/test1050 b/tests/data/test1050 index 0f8267f95..3aa2f017e 100644 --- a/tests/data/test1050 +++ b/tests/data/test1050 @@ -44,9 +44,6 @@ FTP-IPv6 dir list, EPRT with specified IP # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of EPRT that curl can send <strippart> s/^(EPRT \|2\|::1\|)(.*)/$1/ diff --git a/tests/data/test1055 b/tests/data/test1055 index 0624a969a..2d1c604b4 100644 --- a/tests/data/test1055 +++ b/tests/data/test1055 @@ -54,9 +54,6 @@ the # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> PUT /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
diff --git a/tests/data/test1057 b/tests/data/test1057 index e211dd7da..a7cb3bc61 100644 --- a/tests/data/test1057 +++ b/tests/data/test1057 @@ -36,9 +36,6 @@ FTP retrieve a byte-range relative to end of file # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test106 b/tests/data/test106 index 2fec63478..b5e1e6929 100644 --- a/tests/data/test106 +++ b/tests/data/test106 @@ -35,9 +35,6 @@ FTP GET with type=A style ASCII URL using %20 codes # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1062 b/tests/data/test1062 index 36b726af8..31a27a947 100644 --- a/tests/data/test1062 +++ b/tests/data/test1062 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test107 b/tests/data/test107 index a92a635f8..a741b7667 100644 --- a/tests/data/test107 +++ b/tests/data/test107 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <upload> data to diff --git a/tests/data/test108 b/tests/data/test108 index ceea4d4b2..20ef6577e 100644 --- a/tests/data/test108 +++ b/tests/data/test108 @@ -31,9 +31,6 @@ Moooooooooooo # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 63d1bc6b6..d466437f2 100644 --- a/tests/data/test109 +++ b/tests/data/test109 @@ -31,9 +31,6 @@ Moooooooooooo # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1091 b/tests/data/test1091 index b5006c6bc..445d31655 100644 --- a/tests/data/test1091 +++ b/tests/data/test1091 @@ -30,9 +30,6 @@ FTP URL with type=i # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1096 b/tests/data/test1096 index f8eb1d4fb..e7b163924 100644 --- a/tests/data/test1096 +++ b/tests/data/test1096 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 78 </errorcode> diff --git a/tests/data/test110 b/tests/data/test110 index c3c3d04bf..e53fcd137 100644 --- a/tests/data/test110 +++ b/tests/data/test110 @@ -36,9 +36,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 20 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1102 b/tests/data/test1102 index 12822b95a..16994d953 100644 --- a/tests/data/test1102 +++ b/tests/data/test1102 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1103 b/tests/data/test1103 index 2ceb89de0..a53b504bd 100644 --- a/tests/data/test1103 +++ b/tests/data/test1103 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1107 b/tests/data/test1107 index de8b7d76e..8b31c76f8 100644 --- a/tests/data/test1107 +++ b/tests/data/test1107 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test111 b/tests/data/test111 index a7cd3c3d2..a46f7aef1 100644 --- a/tests/data/test111 +++ b/tests/data/test111 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 2000 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 36 </errorcode> diff --git a/tests/data/test1113 b/tests/data/test1113 index c7eaf2e93..744c012ee 100644 --- a/tests/data/test1113 +++ b/tests/data/test1113 @@ -36,9 +36,6 @@ FTP wildcard download - changed fnmatch, 2x perform (DOS LIST response) ############################################ # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 0 </errorcode> diff --git a/tests/data/test112 b/tests/data/test112 index 231f3452f..41bbc025d 100644 --- a/tests/data/test112 +++ b/tests/data/test112 @@ -31,9 +31,6 @@ worx? # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1137 b/tests/data/test1137 index 4e8f24f09..cb20aee31 100644 --- a/tests/data/test1137 +++ b/tests/data/test1137 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ignore-content-length # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1149 b/tests/data/test1149 index 4b3ba376e..d4e97d540 100644 --- a/tests/data/test1149 +++ b/tests/data/test1149 @@ -42,9 +42,6 @@ ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method multicwd --next # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test115 b/tests/data/test115 index e4da7ea1f..22f75c0b6 100644 --- a/tests/data/test115 +++ b/tests/data/test115 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 13 </errorcode> diff --git a/tests/data/test1152 b/tests/data/test1152 index 6052b70b5..1823bab4a 100644 --- a/tests/data/test1152 +++ b/tests/data/test1152 @@ -45,9 +45,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1153 b/tests/data/test1153 index 56ed84005..a74b1838c 100644 --- a/tests/data/test1153 +++ b/tests/data/test1153 @@ -45,9 +45,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test116 b/tests/data/test116 index cab67ad57..0ab00aae9 100644 --- a/tests/data/test116 +++ b/tests/data/test116 @@ -35,9 +35,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P 1.2.3.4 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 30 </errorcode> diff --git a/tests/data/test1162 b/tests/data/test1162 index 5aa706b7f..b6b394139 100644 --- a/tests/data/test1162 +++ b/tests/data/test1162 @@ -37,9 +37,6 @@ MSYS2_ARG_CONV_EXCL=ftp:// </setenv> </client> <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1163 b/tests/data/test1163 index 09ede0cb8..a109b511b 100644 --- a/tests/data/test1163 +++ b/tests/data/test1163 @@ -33,9 +33,6 @@ FTP wildcard with pattern ending with an open-bracket </command> </client> <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test117 b/tests/data/test117 index c292af730..3bd5cb57f 100644 --- a/tests/data/test117 +++ b/tests/data/test117 @@ -28,9 +28,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 17 </errorcode> diff --git a/tests/data/test118 b/tests/data/test118 index de7012140..9b5b8708e 100644 --- a/tests/data/test118 +++ b/tests/data/test118 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 19 </errorcode> diff --git a/tests/data/test119 b/tests/data/test119 index 2b36051f9..4426def0b 100644 --- a/tests/data/test119 +++ b/tests/data/test119 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 19 </errorcode> diff --git a/tests/data/test120 b/tests/data/test120 index 6e285b433..64628b659 100644 --- a/tests/data/test120 +++ b/tests/data/test120 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE file" # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1206 b/tests/data/test1206 index 6abb0c596..228df4adb 100644 --- a/tests/data/test1206 +++ b/tests/data/test1206 @@ -33,9 +33,6 @@ FTP PORT and 425 on download # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <strippart> s/^EPRT \|1\|(.*)/EPRT \|1\|/ </strippart> diff --git a/tests/data/test1207 b/tests/data/test1207 index e192e425e..612c42b0d 100644 --- a/tests/data/test1207 +++ b/tests/data/test1207 @@ -33,9 +33,6 @@ FTP PORT and 421 on download # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <strippart> s/^EPRT \|1\|(.*)/EPRT \|1\|/ </strippart> diff --git a/tests/data/test121 b/tests/data/test121 index d9dfe2794..3625d0e3e 100644 --- a/tests/data/test121 +++ b/tests/data/test121 @@ -35,9 +35,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE after_transfer" -Q "DELE before_tra # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1217 b/tests/data/test1217 index 47059b247..691c88e73 100644 --- a/tests/data/test1217 +++ b/tests/data/test1217 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/get/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/get/file/agai # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 b28077dce..454654399 100644 --- a/tests/data/test1219 +++ b/tests/data/test1219 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> PWD
EPSV
diff --git a/tests/data/test122 b/tests/data/test122 index 0566b2407..1f007c1ce 100644 --- a/tests/data/test122 +++ b/tests/data/test122 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 5 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1224 b/tests/data/test1224 index 61036cd08..64ba4482c 100644 --- a/tests/data/test1224 +++ b/tests/data/test1224 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1225 b/tests/data/test1225 index 39abfcb91..b20363c3e 100644 --- a/tests/data/test1225 +++ b/tests/data/test1225 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT//foo/%TESTNUMBER ftp://%HOSTIP:%FTPPORT//foo/bar/%TESTNUM # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1226 b/tests/data/test1226 index 4ae0e6aff..08e706b9b 100644 --- a/tests/data/test1226 +++ b/tests/data/test1226 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method singlecwd # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1227 b/tests/data/test1227 index f8246fa46..30477a46a 100644 --- a/tests/data/test1227 +++ b/tests/data/test1227 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method nocwd # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test123 b/tests/data/test123 index 1d29c8668..8ccd69cf6 100644 --- a/tests/data/test123 +++ b/tests/data/test123 @@ -28,9 +28,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 51 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1233 b/tests/data/test1233 index 7b59c8ed4..956353349 100644 --- a/tests/data/test1233 +++ b/tests/data/test1233 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test124 b/tests/data/test124 index 2dfc96bb8..d2717949c 100644 --- a/tests/data/test124 +++ b/tests/data/test124 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test125 b/tests/data/test125 index a615d092f..8de97c14e 100644 --- a/tests/data/test125 +++ b/tests/data/test125 @@ -27,9 +27,6 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 9 </errorcode> diff --git a/tests/data/test126 b/tests/data/test126 index 285618f11..b830fc778 100644 --- a/tests/data/test126 +++ b/tests/data/test126 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1262 b/tests/data/test1262 index 2cb5d8857..0a7046ce9 100644 --- a/tests/data/test1262 +++ b/tests/data/test1262 @@ -28,9 +28,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "-1 jan 2001" </client> <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test127 b/tests/data/test127 index 6871e0dc4..ebf122d01 100644 --- a/tests/data/test127 +++ b/tests/data/test127 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER --disable-epsv # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test128 b/tests/data/test128 index d46f454ef..089717da7 100644 --- a/tests/data/test128 +++ b/tests/data/test128 @@ -35,9 +35,6 @@ the # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test130 b/tests/data/test130 index a0673dd8f..2c4dfe85e 100644 --- a/tests/data/test130 +++ b/tests/data/test130 @@ -50,9 +50,6 @@ default login userdef password passwddef # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER user1
PASS passwd1
diff --git a/tests/data/test131 b/tests/data/test131 index 0511520f7..4a73de285 100644 --- a/tests/data/test131 +++ b/tests/data/test131 @@ -47,9 +47,6 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER user2
PASS passwd2
diff --git a/tests/data/test1316 b/tests/data/test1316 index c3f70878a..2218b6e14 100644 --- a/tests/data/test1316 +++ b/tests/data/test1316 @@ -60,9 +60,6 @@ ftp://ftp.%TESTNUMBER:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test132 b/tests/data/test132 index 47748494b..77d47c8fd 100644 --- a/tests/data/test132 +++ b/tests/data/test132 @@ -47,9 +47,6 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER mary
PASS mark
diff --git a/tests/data/test133 b/tests/data/test133 index f80d840ab..4a2c46cde 100644 --- a/tests/data/test133 +++ b/tests/data/test133 @@ -47,9 +47,6 @@ machine %HOSTIP login mary password drfrank # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER mary
PASS drfrank
diff --git a/tests/data/test134 b/tests/data/test134 index aa104bf15..207e4f5d4 100644 --- a/tests/data/test134 +++ b/tests/data/test134 @@ -49,9 +49,6 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER romulus
PASS rhemus
diff --git a/tests/data/test1348 b/tests/data/test1348 index fde0ffb24..b99ab58f8 100644 --- a/tests/data/test1348 +++ b/tests/data/test1348 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1349 b/tests/data/test1349 index 416736667..03f91ae23 100644 --- a/tests/data/test1349 +++ b/tests/data/test1349 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --out # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test135 b/tests/data/test135 index cdb548362..3dc1d531f 100644 --- a/tests/data/test135 +++ b/tests/data/test135 @@ -38,9 +38,6 @@ FTP retrieve a byte-range # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1350 b/tests/data/test1350 index f896f22b1..60d362077 100644 --- a/tests/data/test1350 +++ b/tests/data/test1350 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1351 b/tests/data/test1351 index 947300f67..05a22ce62 100644 --- a/tests/data/test1351 +++ b/tests/data/test1351 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER -- # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1352 b/tests/data/test1352 index a74d2f33f..ae94e5aad 100644 --- a/tests/data/test1352 +++ b/tests/data/test1352 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1353 b/tests/data/test1353 index a4df5d8ba..45aad1c4b 100644 --- a/tests/data/test1353 +++ b/tests/data/test1353 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER -- # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1354 b/tests/data/test1354 index 3413d4677..c7ff933cc 100644 --- a/tests/data/test1354 +++ b/tests/data/test1354 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1355 b/tests/data/test1355 index e99dd015d..7158a6e99 100644 --- a/tests/data/test1355 +++ b/tests/data/test1355 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1356 b/tests/data/test1356 index 77a88be56..e690747f1 100644 --- a/tests/data/test1356 +++ b/tests/data/test1356 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1357 b/tests/data/test1357 index b0943b7f6..926fd538d 100644 --- a/tests/data/test1357 +++ b/tests/data/test1357 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --out # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1358 b/tests/data/test1358 index c71520c95..14fc95afe 100644 --- a/tests/data/test1358 +++ b/tests/data/test1358 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1359 b/tests/data/test1359 index 63cdc4ce3..c26ac187b 100644 --- a/tests/data/test1359 +++ b/tests/data/test1359 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER -- # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test136 b/tests/data/test136 index f71f4b36a..ef0b2c49a 100644 --- a/tests/data/test136 +++ b/tests/data/test136 @@ -28,9 +28,6 @@ FTP with user and no password # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER user
PASS
diff --git a/tests/data/test1360 b/tests/data/test1360 index 6f8732a1e..a7ed49302 100644 --- a/tests/data/test1360 +++ b/tests/data/test1360 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1361 b/tests/data/test1361 index c80b097a5..18c9f5f08 100644 --- a/tests/data/test1361 +++ b/tests/data/test1361 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER -- # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1362 b/tests/data/test1362 index 9e4890ae0..261950969 100644 --- a/tests/data/test1362 +++ b/tests/data/test1362 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1363 b/tests/data/test1363 index 4ef72cf77..022940257 100644 --- a/tests/data/test1363 +++ b/tests/data/test1363 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test137 b/tests/data/test137 index 8154af88d..33b93589e 100644 --- a/tests/data/test137 +++ b/tests/data/test137 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1378 b/tests/data/test1378 index f8551251a..199679cab 100644 --- a/tests/data/test1378 +++ b/tests/data/test1378 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1379 b/tests/data/test1379 index 9cecb0eae..39b66ebe3 100644 --- a/tests/data/test1379 +++ b/tests/data/test1379 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %L # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test138 b/tests/data/test138 index e00c3110c..db3b6ec7d 100644 --- a/tests/data/test138 +++ b/tests/data/test138 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1380 b/tests/data/test1380 index d53422395..cca8020eb 100644 --- a/tests/data/test1380 +++ b/tests/data/test1380 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D - # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1381 b/tests/data/test1381 index 28c2af5fe..3455369a9 100644 --- a/tests/data/test1381 +++ b/tests/data/test1381 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1382 b/tests/data/test1382 index d96ad468a..78d05a321 100644 --- a/tests/data/test1382 +++ b/tests/data/test1382 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1383 b/tests/data/test1383 index 2c9f33291..96c3e9a27 100644 --- a/tests/data/test1383 +++ b/tests/data/test1383 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1384 b/tests/data/test1384 index 1dd2aa280..4251c42a1 100644 --- a/tests/data/test1384 +++ b/tests/data/test1384 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1385 b/tests/data/test1385 index 8654da654..c14ddba20 100644 --- a/tests/data/test1385 +++ b/tests/data/test1385 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1386 b/tests/data/test1386 index 44b8dcd42..72f13ca58 100644 --- a/tests/data/test1386 +++ b/tests/data/test1386 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1387 b/tests/data/test1387 index 6a24b7678..43c28cc58 100644 --- a/tests/data/test1387 +++ b/tests/data/test1387 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %L # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1388 b/tests/data/test1388 index a26a829c0..0a3c173e5 100644 --- a/tests/data/test1388 +++ b/tests/data/test1388 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D - # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1389 b/tests/data/test1389 index 77f7b5f27..0c648309e 100644 --- a/tests/data/test1389 +++ b/tests/data/test1389 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test139 b/tests/data/test139 index 61a0da601..160f628e2 100644 --- a/tests/data/test139 +++ b/tests/data/test139 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 1989" # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1390 b/tests/data/test1390 index be7cf2ed9..6b3f4dad3 100644 --- a/tests/data/test1390 +++ b/tests/data/test1390 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1391 b/tests/data/test1391 index c0c5bc58a..447a57829 100644 --- a/tests/data/test1391 +++ b/tests/data/test1391 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1392 b/tests/data/test1392 index 49472104e..4af796688 100644 --- a/tests/data/test1392 +++ b/tests/data/test1392 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1393 b/tests/data/test1393 index 81734206e..492da66fc 100644 --- a/tests/data/test1393 +++ b/tests/data/test1393 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test140 b/tests/data/test140 index cacef2ae2..5e29f5c7c 100644 --- a/tests/data/test140 +++ b/tests/data/test140 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 2004" # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1405 b/tests/data/test1405 index 0b1be439b..b4560aa05 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -45,9 +45,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FA # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test141 b/tests/data/test141 index 5ffbc4523..425a98f2a 100644 --- a/tests/data/test141 +++ b/tests/data/test141 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1414 b/tests/data/test1414 index 9fc2a56ff..4be9b5422 100644 --- a/tests/data/test1414 +++ b/tests/data/test1414 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <strippart> s/^(EPRT \|1\|)(.*)/$1/ s/^(PORT)(.*)/$1/ diff --git a/tests/data/test142 b/tests/data/test142 index e09b744f9..cb03b832a 100644 --- a/tests/data/test142 +++ b/tests/data/test142 @@ -26,9 +26,6 @@ ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/par # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test143 b/tests/data/test143 index 8984a3f1f..ed89e70de 100644 --- a/tests/data/test143 +++ b/tests/data/test143 @@ -28,9 +28,6 @@ FTP URL with type=a # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test144 b/tests/data/test144 index e7a983bca..be2ca5c8c 100644 --- a/tests/data/test144 +++ b/tests/data/test144 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 860c66304..2f4c8d068 100644 --- a/tests/data/test1444 +++ b/tests/data/test1444 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1449 b/tests/data/test1449 index d761f3c0e..0b9de0192 100644 --- a/tests/data/test1449 +++ b/tests/data/test1449 @@ -27,9 +27,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -r 36893488147419103232- # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test145 b/tests/data/test145 index 7f12b36f3..53f3f631d 100644 --- a/tests/data/test145 +++ b/tests/data/test145 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 19 </errorcode> diff --git a/tests/data/test146 b/tests/data/test146 index c7586573e..803fbfc4d 100644 --- a/tests/data/test146 +++ b/tests/data/test146 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNU # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 b2772f607..769043d48 100644 --- a/tests/data/test147 +++ b/tests/data/test147 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER --ftp-create-dirs # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 c8ec7a6d1..051d31a9d 100644 --- a/tests/data/test148 +++ b/tests/data/test148 @@ -28,9 +28,6 @@ ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/%TESTNUMBER --ftp-create-dirs # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 60d9089ae..404922b29 100644 --- a/tests/data/test149 +++ b/tests/data/test149 @@ -27,9 +27,6 @@ send away this contents # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 070ff7d97..195c17998 100644 --- a/tests/data/test1501 +++ b/tests/data/test1501 @@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ </client> # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 0 </errorcode> diff --git a/tests/data/test1547 b/tests/data/test1547 index 244151a5a..067b3568e 100644 --- a/tests/data/test1547 +++ b/tests/data/test1547 @@ -42,9 +42,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ -P %CLIENTIP --ftp-pasv # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1569 b/tests/data/test1569 index 24f16ee78..159a81391 100644 --- a/tests/data/test1569 +++ b/tests/data/test1569 @@ -40,9 +40,6 @@ lib%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1570 b/tests/data/test1570 index e558b9bc3..713ab5ea7 100644 --- a/tests/data/test1570 +++ b/tests/data/test1570 @@ -40,9 +40,6 @@ lib1569 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test1631 b/tests/data/test1631 index 7c470b3c8..e838700fe 100644 --- a/tests/data/test1631 +++ b/tests/data/test1631 @@ -54,9 +54,6 @@ proxy # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # 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 18d400fd4..9d877f8f8 100644 --- a/tests/data/test1632 +++ b/tests/data/test1632 @@ -63,9 +63,6 @@ proxy # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # 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 b49f10f85..cb1e4f0c2 100644 --- a/tests/data/test182 +++ b/tests/data/test182 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test191 b/tests/data/test191 index 749a34ec9..029369363 100644 --- a/tests/data/test191 +++ b/tests/data/test191 @@ -27,9 +27,6 @@ FTP URL with ?-letters in username and password # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER use?r
PASS pass?word
diff --git a/tests/data/test2000 b/tests/data/test2000 index ee2e50734..032bf5b1b 100644 --- a/tests/data/test2000 +++ b/tests/data/test2000 @@ -46,9 +46,6 @@ moo # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test2001 b/tests/data/test2001 index 39eb1ff9d..de1673531 100644 --- a/tests/data/test2001 +++ b/tests/data/test2001 @@ -63,9 +63,6 @@ moo # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> GET /%TESTNUMBER0001 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
diff --git a/tests/data/test2002 b/tests/data/test2002 index 7a581a5cb..4b2b4fef6 100644 --- a/tests/data/test2002 +++ b/tests/data/test2002 @@ -73,9 +73,6 @@ moo # Verify data after the test has been "shot" <verify> <strip> -QUIT -</strip> -<strip> ^timeout = [5-6]$ </strip> <protocol> diff --git a/tests/data/test2003 b/tests/data/test2003 index e37fd4e04..5ab3e41ac 100644 --- a/tests/data/test2003 +++ b/tests/data/test2003 @@ -73,9 +73,6 @@ moo # Verify data after the test has been "shot" <verify> <strip> -QUIT -</strip> -<strip> ^timeout = [5-6]$ </strip> <protocol> diff --git a/tests/data/test2039 b/tests/data/test2039 index 05f23ab74..7cab984ce 100644 --- a/tests/data/test2039 +++ b/tests/data/test2039 @@ -48,9 +48,6 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER userdef
PASS passwddef
diff --git a/tests/data/test210 b/tests/data/test210 index c4ccb6b2c..1ee313d76 100644 --- a/tests/data/test210 +++ b/tests/data/test210 @@ -33,9 +33,6 @@ data blobb # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test211 b/tests/data/test211 index 01dcad0ee..6830727ab 100644 --- a/tests/data/test211 +++ b/tests/data/test211 @@ -34,9 +34,6 @@ data blobb # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test212 b/tests/data/test212 index a16bf4211..045ad3769 100644 --- a/tests/data/test212 +++ b/tests/data/test212 @@ -39,9 +39,6 @@ data blobb # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip the addresses and port number but leave the rest <strippart> 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 d2ba2c702..058639f27 100644 --- a/tests/data/test215 +++ b/tests/data/test215 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNU # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test216 b/tests/data/test216 index a0ec72be1..1be87c0d1 100644 --- a/tests/data/test216 +++ b/tests/data/test216 @@ -27,9 +27,6 @@ upload this file twice # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test227 b/tests/data/test227 index bf55fdd6c..f7b445185 100644 --- a/tests/data/test227 +++ b/tests/data/test227 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FA # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test228 b/tests/data/test228 index ae19b534b..8e7d73ff0 100644 --- a/tests/data/test228 +++ b/tests/data/test228 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count" # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test2307 b/tests/data/test2307 index cbb581a4a..198976bf9 100644 --- a/tests/data/test2307 +++ b/tests/data/test2307 @@ -41,9 +41,6 @@ FTP retrieve a byte-range with end larger than file # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol crlf="yes"> USER anonymous PASS ftp@example.com diff --git a/tests/data/test235 b/tests/data/test235 index 4e112398a..7081a776c 100644 --- a/tests/data/test235 +++ b/tests/data/test235 @@ -33,9 +33,6 @@ worx? # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test236 b/tests/data/test236 index 13493f26a..a66fa046d 100644 --- a/tests/data/test236 +++ b/tests/data/test236 @@ -33,9 +33,6 @@ Test data # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
diff --git a/tests/data/test238 b/tests/data/test238 index 3173237eb..6e2af83d7 100644 --- a/tests/data/test238 +++ b/tests/data/test238 @@ -27,9 +27,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # 13 = CURLE_FTP_WEIRD_PASV_REPLY <errorcode> 13 diff --git a/tests/data/test244 b/tests/data/test244 index ad9cf4fe2..782be2be4 100644 --- a/tests/data/test244 +++ b/tests/data/test244 @@ -41,9 +41,6 @@ FTP dir listing with nocwd and URL encoded path # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test247 b/tests/data/test247 index db11c93b2..8b154f419 100644 --- a/tests/data/test247 +++ b/tests/data/test247 @@ -35,9 +35,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test248 b/tests/data/test248 index ed3f3779f..b497dd7af 100644 --- a/tests/data/test248 +++ b/tests/data/test248 @@ -36,9 +36,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <upload> data to diff --git a/tests/data/test250 b/tests/data/test250 index 59f7fa311..4f01ea79a 100644 --- a/tests/data/test250 +++ b/tests/data/test250 @@ -46,9 +46,6 @@ ftp://%HOSTIP:%FTPPORT/ # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test251 b/tests/data/test251 index 6de2003c8..9ed8c9488 100644 --- a/tests/data/test251 +++ b/tests/data/test251 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 35c3014a0..1480ee1ec 100644 --- a/tests/data/test252 +++ b/tests/data/test252 @@ -45,9 +45,6 @@ FTP IPv6 dir list PASV # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test253 b/tests/data/test253 index 8f7192d21..01ec416ac 100644 --- a/tests/data/test253 +++ b/tests/data/test253 @@ -45,9 +45,6 @@ FTP IPv6 dir list with EPRT # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <strippart> s/^(EPRT \|2\|::1\|)(.*)/$1/ </strippart> diff --git a/tests/data/test254 b/tests/data/test254 index ede445355..90b58a0b3 100644 --- a/tests/data/test254 +++ b/tests/data/test254 @@ -46,9 +46,6 @@ FTP IPv6 dir list PASV and --disable-epsv # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test255 b/tests/data/test255 index 190908e35..1a1526a10 100644 --- a/tests/data/test255 +++ b/tests/data/test255 @@ -46,9 +46,6 @@ FTP IPv6 dir list with EPRT and --disable-eprt # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <strippart> s/^(EPRT \|2\|::1\|)(.*)/$1/ </strippart> diff --git a/tests/data/test261 b/tests/data/test261 index 192b2bcd7..d5f940372 100644 --- a/tests/data/test261 +++ b/tests/data/test261 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test270 b/tests/data/test270 index f4f5a0231..efa183f15 100644 --- a/tests/data/test270 +++ b/tests/data/test270 @@ -36,9 +36,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-skip-pasv-ip --disable-epsv # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test272 b/tests/data/test272 index 5607a1081..2857c3eac 100644 --- a/tests/data/test272 +++ b/tests/data/test272 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -z "2004 jan 1 12:12:12 UTC" # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test280 b/tests/data/test280 index dbe809e1d..1aee4b517 100644 --- a/tests/data/test280 +++ b/tests/data/test280 @@ -46,9 +46,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-alternative-to-user "USER replacement" # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
USER replacement
diff --git a/tests/data/test290 b/tests/data/test290 index 6ffa9a726..e7048a538 100644 --- a/tests/data/test290 +++ b/tests/data/test290 @@ -27,9 +27,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 30 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 63 </errorcode> diff --git a/tests/data/test291 b/tests/data/test291 index 2385f7db4..05cc2b444 100644 --- a/tests/data/test291 +++ b/tests/data/test291 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 100 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test294 b/tests/data/test294 index 4e2e9857d..67108aedb 100644 --- a/tests/data/test294 +++ b/tests/data/test294 @@ -47,9 +47,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-account "data for acct" # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test296 b/tests/data/test296 index d4b87dfa4..c88ec99bf 100644 --- a/tests/data/test296 +++ b/tests/data/test296 @@ -31,9 +31,6 @@ FTP CWD with --ftp-method multicwd # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test297 b/tests/data/test297 index d982a3b7f..99c10d3e1 100644 --- a/tests/data/test297 +++ b/tests/data/test297 @@ -31,9 +31,6 @@ FTP CWD with --ftp-method singlecwd # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test298 b/tests/data/test298 index 3880a6073..5188c8547 100644 --- a/tests/data/test298 +++ b/tests/data/test298 @@ -31,9 +31,6 @@ FTP CWD with --ftp-method nocwd # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test3027 b/tests/data/test3027 index 416c0079d..05a811f4e 100644 --- a/tests/data/test3027 +++ b/tests/data/test3027 @@ -40,9 +40,6 @@ data blobb # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test336 b/tests/data/test336 index 4e881379a..f50b42adb 100644 --- a/tests/data/test336 +++ b/tests/data/test336 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test337 b/tests/data/test337 index b82f94786..d44a712fb 100644 --- a/tests/data/test337 +++ b/tests/data/test337 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6 # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test348 b/tests/data/test348 index 988e5bd04..55e9d608d 100644 --- a/tests/data/test348 +++ b/tests/data/test348 @@ -36,9 +36,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <upload> data to diff --git a/tests/data/test350 b/tests/data/test350 index 7342275d4..3eb8b80aa 100644 --- a/tests/data/test350 +++ b/tests/data/test350 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method multicwd # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test351 b/tests/data/test351 index 31c07fa3c..ffa93e3e2 100644 --- a/tests/data/test351 +++ b/tests/data/test351 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method nocwd # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test352 b/tests/data/test352 index d54ab60eb..0cc4d69fd 100644 --- a/tests/data/test352 +++ b/tests/data/test352 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method singlecwd # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test353 b/tests/data/test353 index dedd06960..a94828bd6 100644 --- a/tests/data/test353 +++ b/tests/data/test353 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT/ --ftp-method singlecwd # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test354 b/tests/data/test354 index 9a40d49c6..dc6d732d8 100644 --- a/tests/data/test354 +++ b/tests/data/test354 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PWD
diff --git a/tests/data/test362 b/tests/data/test362 index d259593fd..e8ce9731e 100644 --- a/tests/data/test362 +++ b/tests/data/test362 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --continue-at </client> <verify> -<strip> -QUIT -</strip> <upload> data to diff --git a/tests/data/test380 b/tests/data/test380 index 47676e3dd..f9ccafdab 100644 --- a/tests/data/test380 +++ b/tests/data/test380 @@ -48,9 +48,6 @@ machine %HOSTIP login mary password yram # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER mary
PASS yram
diff --git a/tests/data/test381 b/tests/data/test381 index bf2877302..41b9eb779 100644 --- a/tests/data/test381 +++ b/tests/data/test381 @@ -52,9 +52,6 @@ machine %HOSTIP login mary password yram # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER mary
PASS drfrank
diff --git a/tests/data/test416 b/tests/data/test416 index f50ad70dd..b6b10b3df 100644 --- a/tests/data/test416 +++ b/tests/data/test416 @@ -38,9 +38,6 @@ FTP growing file support # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test475 b/tests/data/test475 index 75e0e6b93..32ad8071f 100644 --- a/tests/data/test475 +++ b/tests/data/test475 @@ -30,9 +30,6 @@ FTP PASV upload ASCII file # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <upload crlf="yes" nonewline="yes"> %repeat[1750 x a line of text used for verifying this !%0a]% </upload> diff --git a/tests/data/test476 b/tests/data/test476 index 2396d3eea..792488fd1 100644 --- a/tests/data/test476 +++ b/tests/data/test476 @@ -26,9 +26,6 @@ FTP PASV upload ASCII file already using CRLF # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <upload crlf="yes" nonewline="yes"> %repeat[1750 x a line of text used for verifying this !%0a]% </upload> diff --git a/tests/data/test494 b/tests/data/test494 index c089d75c7..648318729 100644 --- a/tests/data/test494 +++ b/tests/data/test494 @@ -46,9 +46,6 @@ machine %HOSTIP login user1 password passwd1 # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER user1
PASS passwd1
diff --git a/tests/data/test500 b/tests/data/test500 index 0534cae1e..0b084ac00 100644 --- a/tests/data/test500 +++ b/tests/data/test500 @@ -55,7 +55,7 @@ Accept: */* </protocol> <limits> -Allocations: 80 +Allocations: 81 Maximum allocated: 33400 </limits> </verify> diff --git a/tests/data/test505 b/tests/data/test505 index 70dfcda06..53a9d4792 100644 --- a/tests/data/test505 +++ b/tests/data/test505 @@ -41,9 +41,6 @@ works? # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <upload> Contents of diff --git a/tests/data/test511 b/tests/data/test511 index 7637dcede..adcabe8bd 100644 --- a/tests/data/test511 +++ b/tests/data/test511 @@ -35,9 +35,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # CURLE_REMOTE_FILE_NOT_FOUND <errorcode> 78 diff --git a/tests/data/test520 b/tests/data/test520 index 17d89199b..6a27bb3f8 100644 --- a/tests/data/test520 +++ b/tests/data/test520 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/520 # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
diff --git a/tests/data/test521 b/tests/data/test521 index eaeb040d3..90473b33a 100644 --- a/tests/data/test521 +++ b/tests/data/test521 @@ -44,9 +44,6 @@ ftp://%HOSTIP/%TESTNUMBER/ %FTPPORT # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER xxx
PASS yyy
diff --git a/tests/data/test525 b/tests/data/test525 index 82a85276f..2b96a7fd9 100644 --- a/tests/data/test525 +++ b/tests/data/test525 @@ -36,9 +36,6 @@ Moooooooooooo # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 3a303e9a0..85b24d5db 100644 --- a/tests/data/test526 +++ b/tests/data/test526 @@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test527 b/tests/data/test527 index 2522af586..3cfe7998c 100644 --- a/tests/data/test527 +++ b/tests/data/test527 @@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test529 b/tests/data/test529 index 243cc11d7..1c21c15ef 100644 --- a/tests/data/test529 +++ b/tests/data/test529 @@ -36,9 +36,6 @@ Moooooooooooo # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 33739ea7e..59501d5ea 100644 --- a/tests/data/test531 +++ b/tests/data/test531 @@ -39,9 +39,6 @@ don't upload this # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip all valid kinds of PORT and EPRT that curl can send <strip> ^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 255c05518..ac97e89b9 100644 --- a/tests/data/test532 +++ b/tests/data/test532 @@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test533 b/tests/data/test533 index f6467acaa..1dbceb6dd 100644 --- a/tests/data/test533 +++ b/tests/data/test533 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test534 b/tests/data/test534 index 87b98b5e7..0e0f35abd 100644 --- a/tests/data/test534 +++ b/tests/data/test534 @@ -38,9 +38,6 @@ ftp://non-existing-host.haxx.se/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TE # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test539 b/tests/data/test539 index b774ead0b..7985a5234 100644 --- a/tests/data/test539 +++ b/tests/data/test539 @@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/path/to/the/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/ # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test541 b/tests/data/test541 index ed4de68b9..787faa3d9 100644 --- a/tests/data/test541 +++ b/tests/data/test541 @@ -41,9 +41,6 @@ works? # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <upload> </upload> <protocol> diff --git a/tests/data/test542 b/tests/data/test542 index 4a412c8bf..b39b1b30d 100644 --- a/tests/data/test542 +++ b/tests/data/test542 @@ -44,9 +44,6 @@ 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 <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test546 b/tests/data/test546 index 6021b6758..f8f01641a 100644 --- a/tests/data/test546 +++ b/tests/data/test546 @@ -44,9 +44,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test562 b/tests/data/test562 index c2cf2546c..d1793891d 100644 --- a/tests/data/test562 +++ b/tests/data/test562 @@ -39,9 +39,6 @@ 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 <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test564 b/tests/data/test564 index 3b0a2ae1e..96a6f9b1a 100644 --- a/tests/data/test564 +++ b/tests/data/test564 @@ -45,9 +45,6 @@ proxy # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test574 b/tests/data/test574 index 46c4883b6..1b185e98a 100644 --- a/tests/data/test574 +++ b/tests/data/test574 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*.txt ############################################ # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 0 </errorcode> diff --git a/tests/data/test575 b/tests/data/test575 index 4ed302fbb..b1725a9b2 100644 --- a/tests/data/test575 +++ b/tests/data/test575 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/* </client> # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <errorcode> 0 </errorcode> diff --git a/tests/data/test582 b/tests/data/test582 index d0bc54e1e..cc3fe5265 100644 --- a/tests/data/test582 +++ b/tests/data/test582 @@ -34,8 +34,6 @@ Moooooooooooo # Verify data after the test has been "shot" <verify> -<strip> -</strip> <protocol> </protocol> <file name="%LOGDIR/file%TESTNUMBER.txt"> diff --git a/tests/data/test586 b/tests/data/test586 index b1cd99002..d441ff5ec 100644 --- a/tests/data/test586 +++ b/tests/data/test586 @@ -45,9 +45,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test588 b/tests/data/test588 index d41131c42..9c8c5f320 100644 --- a/tests/data/test588 +++ b/tests/data/test588 @@ -45,9 +45,6 @@ Moooooooooooo # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip off parts of the PORT and EPRT commands that might differ <strippart> s/^PORT (.*)/PORT/ diff --git a/tests/data/test591 b/tests/data/test591 index 10d12ca26..d1cbf082a 100644 --- a/tests/data/test591 +++ b/tests/data/test591 @@ -47,9 +47,6 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip off parts of the PORT and EPRT commands that might differ <strippart> s/^PORT (.*)/PORT/ diff --git a/tests/data/test592 b/tests/data/test592 index a6fbaf72b..f77eb9a87 100644 --- a/tests/data/test592 +++ b/tests/data/test592 @@ -47,9 +47,6 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip off parts of the PORT and EPRT commands that might differ <strippart> s/^PORT (.*)/PORT/ diff --git a/tests/data/test593 b/tests/data/test593 index 5c3bdf35f..9a15a5184 100644 --- a/tests/data/test593 +++ b/tests/data/test593 @@ -47,9 +47,6 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip off parts of the PORT and EPRT commands that might differ <strippart> s/^PORT (.*)/PORT/ diff --git a/tests/data/test594 b/tests/data/test594 index e0dfc56e3..cd98f0b9d 100644 --- a/tests/data/test594 +++ b/tests/data/test594 @@ -49,9 +49,6 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> # Strip off parts of the PORT and EPRT commands that might differ <strippart> s/^PORT (.*)/PORT/ diff --git a/tests/data/test595 b/tests/data/test595 index 9a80aa7e2..65f23f7ea 100644 --- a/tests/data/test595 +++ b/tests/data/test595 @@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test596 b/tests/data/test596 index 38f24ab92..2c257a704 100644 --- a/tests/data/test596 +++ b/tests/data/test596 @@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER activeftp # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <strippart> s/^(EPRT \|1\|)(.*)/$1/ </strippart> diff --git a/tests/data/test661 b/tests/data/test661 index 799d51e2d..5965bd8ae 100644 --- a/tests/data/test661 +++ b/tests/data/test661 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/ # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test698 b/tests/data/test698 index 5fdf10541..10cf42cea 100644 --- a/tests/data/test698 +++ b/tests/data/test698 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count" ftp://%HOSTIP:%FTPP # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test706 b/tests/data/test706 index 8fbb24ba5..faafd9038 100644 --- a/tests/data/test706 +++ b/tests/data/test706 @@ -47,9 +47,6 @@ FTP dir list PASV via SOCKS4 # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test707 b/tests/data/test707 index f22b2010e..2c41dfea7 100644 --- a/tests/data/test707 +++ b/tests/data/test707 @@ -47,9 +47,6 @@ FTP dir list PASV via SOCKS5 # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test711 b/tests/data/test711 index 288fcc1df..355ca0e51 100644 --- a/tests/data/test711 +++ b/tests/data/test711 @@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test712 b/tests/data/test712 index ef64b3f5b..7bcc2a1bb 100644 --- a/tests/data/test712 +++ b/tests/data/test712 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test713 b/tests/data/test713 index 81374027f..44820a78f 100644 --- a/tests/data/test713 +++ b/tests/data/test713 @@ -38,9 +38,6 @@ ftp://ftp.example.com/%TESTNUMBER --connect-to ::%HOSTIP:%FTPPORT --proxy socks5 # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test714 b/tests/data/test714 index 6414188e6..a38400bb8 100644 --- a/tests/data/test714 +++ b/tests/data/test714 @@ -57,9 +57,6 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test715 b/tests/data/test715 index e931e0d60..6f9670af5 100644 --- a/tests/data/test715 +++ b/tests/data/test715 @@ -59,9 +59,6 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test754 b/tests/data/test754 index 9253d9f22..42234bab2 100644 --- a/tests/data/test754 +++ b/tests/data/test754 @@ -42,9 +42,6 @@ ftp://%HOSTIP:%FTPPORT/path/ -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> USER anonymous
PASS ftp@example.com
diff --git a/tests/data/test761 b/tests/data/test761 new file mode 100644 index 000000000..55005c462 --- /dev/null +++ b/tests/data/test761 @@ -0,0 +1,33 @@ +<testcase> +<info> +<keywords> +globbing +</keywords> +</info> + +# +# Client-side +<client> +<server> +none +</server> +<name> +too many {} globs +</name> +<command> +http://testingthis/{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<errorcode> +3 +</errorcode> +<stderr mode="text"> +curl: (3) too many {} sets in URL position 403: +http://testingthis/{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a}b{a +</stderr> +</verify> +</testcase> diff --git a/tests/data/test762 b/tests/data/test762 new file mode 100644 index 000000000..62ce9e632 --- /dev/null +++ b/tests/data/test762 @@ -0,0 +1,56 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +--remote-time +</keywords> +</info> + +# +<reply> +<data nocheck="yes"> +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Wed, 09 Oct 1940 16:45:49 +0100 +Content-Length: 6 +Connection: close + +12345 +</data> +</reply> + +# +# Client-side +<client> +<server> +http +</server> +<name> +HTTP GET with --remote-time with file date from 1940 +</name> +<command option="no-output,no-include"> +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time --output-dir %LOGDIR +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+</protocol> +<file name="%LOGDIR/%TESTNUMBER"> +12345 +</file> +# Modify: 1940-10-09 16:45:49.000000000 +0100 +<postcheck> +%PERL -e 'exit((stat("%LOGDIR/%TESTNUMBER"))[9] != -922349651)' +</postcheck> +</verify> +</testcase> diff --git a/tests/data/test973 b/tests/data/test973 index 16c9929e0..edf2973eb 100644 --- a/tests/data/test973 +++ b/tests/data/test973 @@ -66,9 +66,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u joe:secret # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
diff --git a/tests/data/test975 b/tests/data/test975 index 1add45791..971e35d34 100644 --- a/tests/data/test975 +++ b/tests/data/test975 @@ -66,9 +66,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --location-trusted -u joe:secret # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
diff --git a/tests/data/test998 b/tests/data/test998 index c3594913d..efb03cac4 100644 --- a/tests/data/test998 +++ b/tests/data/test998 @@ -69,9 +69,6 @@ HTTP with auth in URL redirected to another host # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> GET http://somewhere.example/998 HTTP/1.1
Host: somewhere.example
diff --git a/tests/data/test999 b/tests/data/test999 index 4f5fafe6f..c0dc52328 100644 --- a/tests/data/test999 +++ b/tests/data/test999 @@ -59,9 +59,6 @@ HTTP with auth in first URL but not second # # Verify data after the test has been "shot" <verify> -<strip> -QUIT -</strip> <protocol> GET http://somewhere.example/%TESTNUMBER HTTP/1.1
Host: somewhere.example
diff --git a/tests/http/test_10_proxy.py b/tests/http/test_10_proxy.py index ac70ec3eb..e61284a4c 100644 --- a/tests/http/test_10_proxy.py +++ b/tests/http/test_10_proxy.py @@ -226,11 +226,11 @@ class TestProxy: extra_args=xargs) assert self.get_tunnel_proto_used(r) == tunnel r.check_response(count=count, http_status=200) + assert r.total_connects == 1, r.dump_logs() indata = open(srcfile).readlines() for i in range(count): respdata = open(curl.response_file(i)).readlines() assert respdata == indata, f'response {i} differs' - assert r.total_connects == 1, r.dump_logs() @pytest.mark.skipif(condition=not Env.have_ssl_curl(), reason="curl without SSL") @pytest.mark.parametrize("tunnel", ['http/1.1', 'h2']) diff --git a/tests/http/test_20_websockets.py b/tests/http/test_20_websockets.py index c28b610f5..2612b0afe 100644 --- a/tests/http/test_20_websockets.py +++ b/tests/http/test_20_websockets.py @@ -135,7 +135,7 @@ class TestWebsockets: if not client.exists(): pytest.skip(f'example client not built: {client.name}') url = f'ws://localhost:{env.ws_port}/' - r = client.run(args=[f'-{model}', '-m', str(0), '-M', str(10), url]) + r = client.run(args=[f'-{model}', '-m', str(1), '-M', str(10), url]) r.check_exit_code(0) @pytest.mark.parametrize("model", [ @@ -193,3 +193,17 @@ class TestWebsockets: large = 20000 r = client.run(args=[f'-{model}', '-c', str(count), '-m', str(large), url]) r.check_exit_code(0) + + @pytest.mark.parametrize("model", [ + pytest.param(1, id='multi_perform'), + pytest.param(2, id='curl_ws_send+recv'), + ]) + def test_20_09_data_empty(self, env: Env, ws_echo, model): + client = LocalClient(env=env, name='cli_ws_data') + if not client.exists(): + pytest.skip(f'example client not built: {client.name}') + url = f'ws://localhost:{env.ws_port}/' + count = 10 + large = 0 + r = client.run(args=[f'-{model}', '-c', str(count), '-m', str(large), url]) + r.check_exit_code(0) diff --git a/tests/libtest/cli_ws_data.c b/tests/libtest/cli_ws_data.c index 501c01eae..36d5dea25 100644 --- a/tests/libtest/cli_ws_data.c +++ b/tests/libtest/cli_ws_data.c @@ -195,6 +195,12 @@ struct test_ws_m1_ctx { char *recv_buf; size_t send_len, nsent; size_t recv_len, nrcvd; + int nframes; + int read_calls; + int write_calls; + int frames_read; + int frames_written; + BIT(frame_reading); }; static size_t test_ws_data_m1_read(char *buf, size_t nitems, size_t buflen, @@ -204,15 +210,37 @@ static size_t test_ws_data_m1_read(char *buf, size_t nitems, size_t buflen, size_t len = nitems * buflen; size_t left = ctx->send_len - ctx->nsent; - curl_mfprintf(stderr, "m1_read(len=%zu, left=%zu)\n", len, left); - if(left) { + ctx->read_calls++; + + if(ctx->frames_read >= ctx->nframes) + goto out; + + if(!ctx->frame_reading) { + curl_ws_start_frame(ctx->easy, CURLWS_BINARY, ctx->send_len); + ctx->frame_reading = TRUE; + } + + if(ctx->frame_reading) { + bool complete; if(left > len) left = len; memcpy(buf, ctx->send_buf + ctx->nsent, left); ctx->nsent += left; + complete = (ctx->send_len == ctx->nsent); + curl_mfprintf(stderr, "m1_read(len=%zu, call #%d, frame #%d%s) -> %zu\n", + len, ctx->read_calls, ctx->frames_read, + complete ? " complete" : "", left); + if(complete) { + ++ctx->frames_read; + ctx->frame_reading = FALSE; + ctx->nsent = 0; + } return left; } - return CURL_READFUNC_PAUSE; +out: + curl_mfprintf(stderr, "m1_read(len=%zu, call #%d) -> EOS\n", + len, ctx->read_calls); + return 0; } static size_t test_ws_data_m1_write(char *buf, size_t nitems, size_t buflen, @@ -220,18 +248,41 @@ static size_t test_ws_data_m1_write(char *buf, size_t nitems, size_t buflen, { struct test_ws_m1_ctx *ctx = userdata; size_t len = nitems * buflen; + bool complete; - curl_mfprintf(stderr, "m1_write(len=%zu)\n", len); - if(len > (ctx->recv_len - ctx->nrcvd)) + ctx->write_calls++; + if(len > (ctx->recv_len - ctx->nrcvd)) { + curl_mfprintf(stderr, "m1_write(len=%zu, call #%d) -> ERROR\n", + len, ctx->write_calls); return CURL_WRITEFUNC_ERROR; + } memcpy(ctx->recv_buf + ctx->nrcvd, buf, len); ctx->nrcvd += len; + complete = (ctx->recv_len == ctx->nrcvd); + + if(memcmp(ctx->send_buf, ctx->recv_buf, ctx->nrcvd)) { + curl_mfprintf(stderr, "m1_write(len=%zu, call #%d, frame #%d) -> " + "data differs\n", + len, ctx->write_calls, ctx->frames_written); + debug_dump("", "expected:", stderr, + (unsigned char *)ctx->send_buf, ctx->nrcvd, 0); + debug_dump("", "received:", stderr, + (unsigned char *)ctx->recv_buf, ctx->nrcvd, 0); + return CURL_WRITEFUNC_ERROR; + } + + curl_mfprintf(stderr, "m1_write(len=%zu, call #%d, frame #%d%s) -> %zu\n", + len, ctx->write_calls, ctx->frames_written, + complete ? " complete" : "", len); + if(complete) { + ++ctx->frames_written; + ctx->nrcvd = 0; + } return len; } /* WebSocket Mode 1: multi handle, READ/WRITEFUNCTION use */ static CURLcode test_ws_data_m1_echo(const char *url, - size_t count, size_t plen_min, size_t plen_max) { @@ -240,6 +291,8 @@ static CURLcode test_ws_data_m1_echo(const char *url, struct test_ws_m1_ctx m1_ctx; size_t i, len; + curl_mfprintf(stderr, "test_ws_data_m1_echo(min=%zu, max=%zu)\n", + plen_min, plen_max); memset(&m1_ctx, 0, sizeof(m1_ctx)); m1_ctx.send_buf = calloc(1, plen_max + 1); m1_ctx.recv_buf = calloc(1, plen_max + 1); @@ -263,59 +316,71 @@ static CURLcode test_ws_data_m1_echo(const char *url, goto out; } - curl_easy_setopt(m1_ctx.easy, CURLOPT_URL, url); - /* use the callback style */ - curl_easy_setopt(m1_ctx.easy, CURLOPT_USERAGENT, "ws-data"); - curl_easy_setopt(m1_ctx.easy, CURLOPT_VERBOSE, 1L); - /* we want to send */ - curl_easy_setopt(m1_ctx.easy, CURLOPT_UPLOAD, 1L); - curl_easy_setopt(m1_ctx.easy, CURLOPT_READFUNCTION, test_ws_data_m1_read); - curl_easy_setopt(m1_ctx.easy, CURLOPT_READDATA, &m1_ctx); - curl_easy_setopt(m1_ctx.easy, CURLOPT_WRITEFUNCTION, test_ws_data_m1_write); - curl_easy_setopt(m1_ctx.easy, CURLOPT_WRITEDATA, &m1_ctx); - - curl_multi_add_handle(multi, m1_ctx.easy); - for(len = plen_min; len <= plen_max; ++len) { /* init what we want to send and expect to receive */ + curl_mfprintf(stderr, "m1_echo, iter len=%zu\n", len); + m1_ctx.send_len = len; m1_ctx.nsent = 0; m1_ctx.recv_len = len; m1_ctx.nrcvd = 0; + m1_ctx.nframes = 2; + m1_ctx.read_calls = 0; + m1_ctx.write_calls = 0; + m1_ctx.frames_read = 0; + m1_ctx.frames_written = 0; memset(m1_ctx.recv_buf, 0, plen_max); curl_easy_pause(m1_ctx.easy, CURLPAUSE_CONT); - for(i = 0; i < count; ++i) { - while(1) { - int still_running; /* keep number of running handles */ - CURLMcode mc = curl_multi_perform(multi, &still_running); - - if(!still_running || (m1_ctx.nrcvd == m1_ctx.recv_len)) { - /* got the full echo back or failed */ - break; - } - - if(!mc && still_running) { - mc = curl_multi_poll(multi, NULL, 0, 1, NULL); - } - if(mc) { - r = CURLE_RECV_ERROR; - goto out; - } - + curl_easy_reset(m1_ctx.easy); + curl_easy_setopt(m1_ctx.easy, CURLOPT_URL, url); + /* use the callback style */ + curl_easy_setopt(m1_ctx.easy, CURLOPT_USERAGENT, "ws-data"); + curl_easy_setopt(m1_ctx.easy, CURLOPT_VERBOSE, 1L); + /* we want to send */ + curl_easy_setopt(m1_ctx.easy, CURLOPT_UPLOAD, 1L); + curl_easy_setopt(m1_ctx.easy, CURLOPT_READFUNCTION, test_ws_data_m1_read); + curl_easy_setopt(m1_ctx.easy, CURLOPT_READDATA, &m1_ctx); + curl_easy_setopt(m1_ctx.easy, CURLOPT_WRITEFUNCTION, + test_ws_data_m1_write); + curl_easy_setopt(m1_ctx.easy, CURLOPT_WRITEDATA, &m1_ctx); + + curl_multi_add_handle(multi, m1_ctx.easy); + + while(1) { + int still_running; /* keep number of running handles */ + CURLMcode mc = curl_multi_perform(multi, &still_running); + + if(!still_running || (m1_ctx.frames_written >= m1_ctx.nframes)) { + /* got the full echo back or failed */ + break; } - if(memcmp(m1_ctx.send_buf, m1_ctx.recv_buf, m1_ctx.send_len)) { - curl_mfprintf(stderr, "recv_data: data differs\n"); - debug_dump("", "expected:", stderr, - (unsigned char *)m1_ctx.send_buf, m1_ctx.send_len, 0); - debug_dump("", "received:", stderr, - (unsigned char *)m1_ctx.recv_buf, m1_ctx.nrcvd, 0); + if(!mc && still_running) { + mc = curl_multi_poll(multi, NULL, 0, 1, NULL); + } + if(mc) { r = CURLE_RECV_ERROR; goto out; } } + + curl_multi_remove_handle(multi, m1_ctx.easy); + + /* check results */ + if(m1_ctx.frames_read < m1_ctx.nframes) { + curl_mfprintf(stderr, "m1_echo, sent only %d/%d frames\n", + m1_ctx.frames_read, m1_ctx.nframes); + r = CURLE_SEND_ERROR; + goto out; + } + if(m1_ctx.frames_written < m1_ctx.frames_read) { + curl_mfprintf(stderr, "m1_echo, received only %d/%d frames\n", + m1_ctx.frames_written, m1_ctx.frames_read); + r = CURLE_RECV_ERROR; + goto out; + } } out: @@ -403,7 +468,7 @@ static CURLcode test_cli_ws_data(const char *URL) curl_global_init(CURL_GLOBAL_ALL); if(model == 1) - res = test_ws_data_m1_echo(url, count, plen_min, plen_max); + res = test_ws_data_m1_echo(url, plen_min, plen_max); else res = test_ws_data_m2_echo(url, count, plen_min, plen_max); diff --git a/tests/runner.pm b/tests/runner.pm index 18f3c5098..0ecfc84c5 100644 --- a/tests/runner.pm +++ b/tests/runner.pm @@ -866,7 +866,6 @@ sub singletest_run { else { $cmdargs .= "--trace-ascii $LOGDIR/trace$testnum "; } - $cmdargs .= "--trace-config all "; $cmdargs .= "--trace-time "; if($run_event_based) { $cmdargs .= "--test-event "; diff --git a/tests/runtests.pl b/tests/runtests.pl index fd6232710..4945e94cd 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -1921,7 +1921,7 @@ sub singletest { my $logdir = getrunnerlogdir($runnerid); # first, remove all lingering log & lock files if(!cleardir($logdir)) { - logmsg "Warning: $runnerid: cleardir($logdir) failed\n"; + #logmsg "Warning: $runnerid: cleardir($logdir) failed\n"; } if(!cleardir("$logdir/$LOCKDIR")) { logmsg "Warning: $runnerid: cleardir($logdir/$LOCKDIR) failed\n"; |