Skip to content

Commit

Permalink
FTP tests 1206 - 1209: don't expect QUIT
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bagder committed Nov 25, 2011
1 parent 2d83385 commit ac54d27
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 12 deletions.
4 changes: 0 additions & 4 deletions tests/data/DISABLED
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,3 @@
592
593
594
1206
1207
1208
1209
9 changes: 7 additions & 2 deletions tests/data/test1206
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -44,10 +50,9 @@ EPRT |1|
TYPE I
SIZE 1206
RETR 1206
QUIT
</protocol>
<errorcode>
19
28
</errorcode>
</verify>
</testcase>
9 changes: 7 additions & 2 deletions tests/data/test1207
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -44,10 +50,9 @@ EPRT |1|
TYPE I
SIZE 1207
RETR 1207
QUIT
</protocol>
<errorcode>
19
28
</errorcode>
</verify>
</testcase>
9 changes: 7 additions & 2 deletions tests/data/test1208
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -44,10 +50,9 @@ EPRT |1|
TYPE I
SIZE 1208
RETR 1208
QUIT
</protocol>
<errorcode>
19
28
</errorcode>
</verify>
</testcase>
9 changes: 7 additions & 2 deletions tests/data/test1209
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -44,10 +50,9 @@ EPRT |1|
TYPE I
SIZE 1209
RETR 1209
QUIT
</protocol>
<errorcode>
19
28
</errorcode>
</verify>
</testcase>

0 comments on commit ac54d27

Please sign in to comment.