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.

diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index b0637dcbe42a87407d0a262cb7cb7d1904d14768..d9f2e00ba48ef68c99c90d42b9a7c5369d519410 100644 (file)
--- 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 862c4bdf429373913ecbc5711be954efc3703ff4..ba578a1e2ab14eba4dab0ea4842eac0e865dd076 100644 (file)
--- 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\r
 PASS ftp@example.com\r
@@ -44,10 +50,9 @@ EPRT |1|
 TYPE I\r
 SIZE 1206\r
 RETR 1206\r
-QUIT\r
 </protocol>
 <errorcode>
-19
+28
 </errorcode>
 </verify>
 </testcase>

diff --git a/tests/data/test1207 b/tests/data/test1207
index acc6427b79fa2d3903ee90d2ba3dcc433f298dde..6ca713196ee3bc5d95eccef1b4e0fe70ff658b6c 100644 (file)
--- 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\r
 PASS ftp@example.com\r
@@ -44,10 +50,9 @@ EPRT |1|
 TYPE I\r
 SIZE 1207\r
 RETR 1207\r
-QUIT\r
 </protocol>
 <errorcode>
-19
+28
 </errorcode>
 </verify>
 </testcase>

diff --git a/tests/data/test1208 b/tests/data/test1208
index 7a81eecd910d21a319dccce09a72c99e460c35d9..725d18afad5842953a7cb9bace875c6d0417dc53 100644 (file)
--- 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\r
 PASS ftp@example.com\r
@@ -44,10 +50,9 @@ EPRT |1|
 TYPE I\r
 SIZE 1208\r
 RETR 1208\r
-QUIT\r
 </protocol>
 <errorcode>
-19
+28
 </errorcode>
 </verify>
 </testcase>

diff --git a/tests/data/test1209 b/tests/data/test1209
index a106f09cfdd26330016d57bd118f68ee5950b563..7086829f1840b7d2907d6ca3aabe0be22018ea9c 100644 (file)
--- 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\r
 PASS ftp@example.com\r
@@ -44,10 +50,9 @@ EPRT |1|
 TYPE I\r
 SIZE 1209\r
 RETR 1209\r
-QUIT\r
 </protocol>
 <errorcode>
-19
+28
 </errorcode>
 </verify>
 </testcase>