diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-11-25 22:38:13 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-11-25 22:49:49 +0100 |
| commit | ac54d27d4bdbd49332cf3914fc726c24c155cbf7 (patch) | |
| tree | 2bc878ddfcc72f850fd8cda544a285835b20e64f /tests | |
| parent | 2d833852f6606a1b6e1a88aeccebba04a3ab5773 (diff) | |
FTP tests 1206 - 1209: don't expect QUIT
The protocol parts for these tests do not include QUIT simply because
the error is CURLE_OPERATION_TIMEDOUT (28) which is a generic timeout
error without specificly saying for which connection it concerns, and
for timeouts libcurl marks the control channel as "invalid". As this
test case times out for the data connection it could still use the
control channel.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/DISABLED | 4 | ||||
| -rw-r--r-- | tests/data/test1206 | 9 | ||||
| -rw-r--r-- | tests/data/test1207 | 9 | ||||
| -rw-r--r-- | tests/data/test1208 | 9 | ||||
| -rw-r--r-- | tests/data/test1209 | 9 |
5 files changed, 28 insertions, 12 deletions
diff --git a/tests/data/DISABLED b/tests/data/DISABLED index b0637dcbe..d9f2e00ba 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -7,7 +7,3 @@ 592 593 594 -1206 -1207 -1208 -1209 diff --git a/tests/data/test1206 b/tests/data/test1206 index 862c4bdf4..ba578a1e2 100644 --- a/tests/data/test1206 +++ b/tests/data/test1206 @@ -36,6 +36,12 @@ FTP PORT and 425 on download <strippart> s/^EPRT \|1\|(.*)/EPRT \|1\|/ </strippart> + +# The protocol part does not include QUIT simply because the error is +# CURLE_OPERATION_TIMEDOUT (28) which is a generic timeout error without +# specificly saying for which connection it concerns, and for timeouts libcurl +# marks the control channel as "invalid". As this test case times out for the +# data connection it could still use the control channel. <protocol> USER anonymous
PASS ftp@example.com
@@ -44,10 +50,9 @@ EPRT |1| TYPE I
SIZE 1206
RETR 1206
-QUIT
</protocol> <errorcode> -19 +28 </errorcode> </verify> </testcase> diff --git a/tests/data/test1207 b/tests/data/test1207 index acc6427b7..6ca713196 100644 --- a/tests/data/test1207 +++ b/tests/data/test1207 @@ -36,6 +36,12 @@ FTP PORT and 421 on download <strippart> s/^EPRT \|1\|(.*)/EPRT \|1\|/ </strippart> + +# The protocol part does not include QUIT simply because the error is +# CURLE_OPERATION_TIMEDOUT (28) which is a generic timeout error without +# specificly saying for which connection it concerns, and for timeouts libcurl +# marks the control channel as "invalid". As this test case times out for the +# data connection it could still use the control channel. <protocol> USER anonymous
PASS ftp@example.com
@@ -44,10 +50,9 @@ EPRT |1| TYPE I
SIZE 1207
RETR 1207
-QUIT
</protocol> <errorcode> -19 +28 </errorcode> </verify> </testcase> diff --git a/tests/data/test1208 b/tests/data/test1208 index 7a81eecd9..725d18afa 100644 --- a/tests/data/test1208 +++ b/tests/data/test1208 @@ -36,6 +36,12 @@ FTP PORT download, no data conn and no transient negative reply <strippart> s/^EPRT \|1\|(.*)/EPRT \|1\|/ </strippart> + +# The protocol part does not include QUIT simply because the error is +# CURLE_OPERATION_TIMEDOUT (28) which is a generic timeout error without +# specificly saying for which connection it concerns, and for timeouts libcurl +# marks the control channel as "invalid". As this test case times out for the +# data connection it could still use the control channel. <protocol> USER anonymous
PASS ftp@example.com
@@ -44,10 +50,9 @@ EPRT |1| TYPE I
SIZE 1208
RETR 1208
-QUIT
</protocol> <errorcode> -19 +28 </errorcode> </verify> </testcase> diff --git a/tests/data/test1209 b/tests/data/test1209 index a106f09cf..7086829f1 100644 --- a/tests/data/test1209 +++ b/tests/data/test1209 @@ -36,6 +36,12 @@ FTP PORT download, no data conn and no positive preliminary reply <strippart> s/^EPRT \|1\|(.*)/EPRT \|1\|/ </strippart> + +# The protocol part does not include QUIT simply because the error is +# CURLE_OPERATION_TIMEDOUT (28) which is a generic timeout error without +# specificly saying for which connection it concerns, and for timeouts libcurl +# marks the control channel as "invalid". As this test case times out for the +# data connection it could still use the control channel. <protocol> USER anonymous
PASS ftp@example.com
@@ -44,10 +50,9 @@ EPRT |1| TYPE I
SIZE 1209
RETR 1209
-QUIT
</protocol> <errorcode> -19 +28 </errorcode> </verify> </testcase> |