Support for FTP third party transfers is now dropped

5 files changed, 4 insertions, 176 deletions

diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 2400ba005..ce6dc9556 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -3,6 +3,5 @@
 # test cases are run by runtests.pl. Just add the plain test case numbers, one
 # per line.
 # Lines starting with '#' letters are treated as comments.
-230
-231
-232
+#230
+
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 067499c6f..0d0df9af0 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -28,8 +28,8 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test194 test195 test196 test197 test198 test515 test516 test517 test518   \
  test210 test211 test212 test220 test221 test222 test223 test224 test206   \
  test207 test208 test209 test213 test240 test241 test242 test519 test214   \
- test215 test216 test217 test218 test199 test225 test226 test227 test230   \
- test231 test232 test228 test229 test233 test234 test235 test236 test520   \
+ test215 test216 test217 test218 test199 test225 test226 test227 \
+ test228 test229 test233 test234 test235 test236 test520   \
  test237 test238 test239 test243 test245 test246 test247 test248 test249   \
  test250 test251 test252 test253 test254 test255 test521 test522 test523   \
  test256 test257 test258 test259 test260 test261 test262 test263 test264   \
diff --git a/tests/data/test230 b/tests/data/test230
deleted file mode 100644
index b473f0504..000000000
--- a/tests/data/test230
+++ /dev/null
@@ -1,57 +0,0 @@
-<info>
-<keywords>
-FTP
-3rd party
-</keywords>
-</info>
-#
-# Server-side
-<reply>
-<data nocheck=1>
-contents of source file 230
-</data>
-</reply>
-
-#
-# Client-side
-<client>
-<server>
-ftp
-ftp2
-</server>
- <name>
-FTP 3rd party transfer
- </name>
- <command>
-ftp://%HOSTIP:%FTPPORT/dest/destpath/230 -u daniel:stenberg --3p-url ftp://%HOSTIP:%FTP2PORT/source/sourcepath/230 --3p-user daniel2:stenberg2
-</command>
-</client>
-
-#
-# Verify data after the test has been "shot"
-<verify>
-# target-side protocol check
-<protocol>
-USER daniel

-PASS stenberg

-PWD

-TYPE I

-CWD dest

-CWD destpath

-PASV

-STOR 230

-QUIT

-</protocol>
-<stripfile>
-s/^(PORT 127,0,0,1).*/$1/
-</stripfile>
-<file name="log/server2.input">
-USER daniel2

-PASS stenberg2

-PWD

-TYPE I

-PORT 127,0,0,1
-RETR source/sourcepath/230

-QUIT

-</file>
-</verify>
diff --git a/tests/data/test231 b/tests/data/test231
deleted file mode 100644
index 320982b75..000000000
--- a/tests/data/test231
+++ /dev/null
@@ -1,57 +0,0 @@
-<info>
-<keywords>
-FTP
-3rd party
-</keywords>
-</info>
-#
-# Server-side
-<reply>
-<data nocheck=1>
-contents of source file 231
-</data>
-</reply>
-
-#
-# Client-side
-<client>
-<server>
-ftp
-ftp2
-</server>
- <name>
-FTP 3rd party transfer, make target use PORT
- </name>
- <command>
-ftp://%HOSTIP:%FTPPORT/dest/destpath/231 -u daniel:stenberg --3p-url ftp://%HOSTIP:%FTP2PORT/source/sourcepath/231 --3p-user daniel2:stenberg2 -P -
-</command>
-</client>
-
-#
-# Verify data after the test has been "shot"
-<verify>
-# target-side protocol check
-<strippart>>
-s/^(PORT 127,0,0,1).*/$1/
-</strippart>
-<protocol>
-USER daniel

-PASS stenberg

-PWD

-TYPE I

-CWD dest

-CWD destpath

-PORT 127,0,0,1
-STOR 231

-QUIT

-</protocol>
-<file name="log/server2.input">
-USER daniel2

-PASS stenberg2

-PWD

-TYPE I

-PASV

-RETR source/sourcepath/231

-QUIT

-</file>
-</verify>
diff --git a/tests/data/test232 b/tests/data/test232
deleted file mode 100644
index b87831ab3..000000000
--- a/tests/data/test232
+++ /dev/null
@@ -1,57 +0,0 @@
-<info>
-<keywords>
-FTP
-3rd party
-</keywords>
-</info>
-#
-# Server-side
-<reply>
-<data nocheck=1>
-contents of source file 232
-</data>
-</reply>
-
-#
-# Client-side
-<client>
-<server>
-ftp
-ftp2
-</server>
- <name>
-FTP 3rd party transfer, anonymous user
- </name>
- <command>
-ftp://%HOSTIP:%FTPPORT/dest/destpath/232 --3p-url ftp://%HOSTIP:%FTP2PORT/source/sourcepath/232
-</command>
-</client>
-
-#
-# Verify data after the test has been "shot"
-<verify>
-# target-side protocol check
-<protocol>
-USER anonymous

-PASS curl_by_daniel@haxx.se

-PWD

-TYPE I

-CWD dest

-CWD destpath

-PASV

-STOR 232

-QUIT

-</protocol>
-<stripfile>
-s/^(PORT 127,0,0,1).*/$1/
-</stripfile>
-<file name="log/server2.input">
-USER anonymous

-PASS curl_by_daniel@haxx.se

-PWD

-TYPE I

-PORT 127,0,0,1
-RETR source/sourcepath/232

-QUIT

-</file>
-</verify>