7 files changed, 159 insertions, 64 deletions
diff --git a/tests/data/test1113 b/tests/data/test1113
index 6ff1d1951..4d692ae38 100644
--- a/tests/data/test1113
+++ b/tests/data/test1113
@@ -2,6 +2,8 @@
 <info>
 <keywords>
 FTP
+RETR
+LIST
 wildcardmatch
 ftplistparser
 </keywords>
@@ -26,7 +28,7 @@ lib574
 FTP wildcard download - changed fnmatch, 2x perform (DOS LIST response)
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/*.txt
+"ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/*.txt"
 </command>
 </client>
 
@@ -36,24 +38,49 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/*.txt
 <errorcode>
 0
 </errorcode>
-<strip>
-^RETR.*
-^EPSV.*
-^PWD.*
-^CWD.*
-^TYPE.*
-^LIST.*
-</strip>
-<strippart>
-s/USER.*/USER/
-s/PASS.*/PASS/
-s/QUIT.*/QUIT/
-</strippart>
-# THERE SHOULD NOT BE "SIZE"! and once "USER && PASS"
+# THERE SHOULD NOT BE "SIZE"! and one "USER/PASS"
 <protocol>
-USER
-PASS
-QUIT
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD fully_simulated
+CWD DOS
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+CWD /
+CWD fully_simulated
+CWD DOS
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+QUIT
 </protocol>
 <stdout mode="text">
 This file should have permissions 444
diff --git a/tests/data/test1200 b/tests/data/test1200
index 4e15ec9dc..ba1159f80 100644
--- a/tests/data/test1200
+++ b/tests/data/test1200
@@ -1,4 +1,3 @@
-# Gopher directory fetch
 <testcase>
 <info>
 <keywords>
diff --git a/tests/data/test1201 b/tests/data/test1201
index ae5ebd11e..81a9fe425 100644
--- a/tests/data/test1201
+++ b/tests/data/test1201
@@ -1,4 +1,3 @@
-# Gopher selector fetch
 <testcase>
 <info>
 <keywords>
diff --git a/tests/data/test1202 b/tests/data/test1202
index 253d42c73..37d270acb 100644
--- a/tests/data/test1202
+++ b/tests/data/test1202
@@ -1,4 +1,3 @@
-# Gopher query fetch
 <testcase>
 <info>
 <keywords>
@@ -27,7 +26,7 @@ gopher
 Gopher query
  </name>
  <command>
-gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine?query%20succeeded/1202
+"gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine?query%20succeeded/1202"
 </command>
 </client>
 
diff --git a/tests/data/test1203 b/tests/data/test1203
index 318cd01b4..3cb83be13 100644
--- a/tests/data/test1203
+++ b/tests/data/test1203
@@ -1,4 +1,3 @@
-# Gopher IPv6 connectivity test
 <testcase>
 <info>
 <keywords>
@@ -20,6 +19,9 @@ iMenu results		error.host	1
 
 # Client-side
 <client>
+<features>
+ipv6
+</features>
 <server>
 gopher-ipv6
 </server>
@@ -27,7 +29,7 @@ gopher-ipv6
 Gopher IPv6 index
  </name>
  <command>
--g "gopher://%HOSTIP:%GOPHER6PORT/1/moo/1203"
+-g gopher://%HOSTIP:%GOPHER6PORT/1/moo/1203
 </command>
 </client>
 
diff --git a/tests/data/test574 b/tests/data/test574
index 9d500457a..1fa4654d4 100644
--- a/tests/data/test574
+++ b/tests/data/test574
@@ -2,6 +2,8 @@
 <info>
 <keywords>
 FTP
+LIST
+RETR
 wildcardmatch
 ftplistparser
 </keywords>
@@ -36,24 +38,49 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*.txt
 <errorcode>
 0
 </errorcode>
-<strip>
-^RETR.*
-^EPSV.*
-^PWD.*
-^CWD.*
-^TYPE.*
-^LIST.*
-</strip>
-<strippart>
-s/USER.*/USER/
-s/PASS.*/PASS/
-s/QUIT.*/QUIT/
-</strippart>
-# THERE SHOULD NOT BE "SIZE"! and once "USER && PASS"
+# THERE SHOULD NOT BE "SIZE"! and one "USER/PASS"
 <protocol>
-USER
-PASS
-QUIT
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD fully_simulated
+CWD UNIX
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+CWD /
+CWD fully_simulated
+CWD UNIX
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+QUIT
 </protocol>
 <stdout mode="text">
 This file should have permissions 444
diff --git a/tests/data/test575 b/tests/data/test575
index c460467d2..5670e6bc6 100644
--- a/tests/data/test575
+++ b/tests/data/test575
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+RETR
 multi
 wildcardmatch
 ftplistparser
@@ -23,7 +24,7 @@ ftp
 lib575
 </tool>
  <name>
-FTP wildcard download - dup_handle && multi interface
+FTP wildcard download - dup_handle and multi interface
  </name>
  <command>
 ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*
@@ -31,32 +32,73 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*
 </client>
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^RETR.*
-^EPSV.*
-^CWD.*
-^PWD.*
-^TYPE.*
-</strip>
-<strippart>
-s/^USER.*/USER/
-s/^PASS.*/PASS/
-s/^LIST.*/LIST/
-s/^QUIT.*/QUIT/
-</strippart>
 <errorcode>
 0
 </errorcode>
 <protocol>
-USER
-PASS
-LIST
-LIST
-QUIT
-USER
-PASS
-LIST
-QUIT
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD fully_simulated
+CWD UNIX
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+CWD /
+CWD fully_simulated
+CWD UNIX
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+QUIT
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD fully_simulated
+CWD UNIX
+EPSV
+TYPE A
+LIST
+EPSV
+TYPE I
+RETR chmod1
+EPSV
+RETR chmod2
+EPSV
+RETR chmod3
+EPSV
+RETR empty_file.dat
+EPSV
+RETR file.txt
+EPSV
+RETR someothertext.txt
+QUIT
 </protocol>
 <stdout mode="text">
 This file should have permissions 444