From ae467115bb58e40449380dde8dd6966b068c4277 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Wed, 25 Aug 2010 16:43:26 -0700 Subject: [PATCH] Tweaked some test data files Fixed some issues that caused xmllint failures, added features and keywords, fixed some quotes and removed some sections that unnecessarily limited test checking. --- tests/data/test1113 | 63 +++++++++++++++++++++++++++----------- tests/data/test1200 | 1 - tests/data/test1201 | 1 - tests/data/test1202 | 3 +- tests/data/test1203 | 6 ++-- tests/data/test574 | 61 ++++++++++++++++++++++++++----------- tests/data/test575 | 88 +++++++++++++++++++++++++++++++++++++++-------------- 7 files changed, 159 insertions(+), 64 deletions(-) diff --git a/tests/data/test1113 b/tests/data/test1113 index 6ff1d19..4d692ae 100644 --- a/tests/data/test1113 +++ b/tests/data/test1113 @@ -2,6 +2,8 @@ FTP +RETR +LIST wildcardmatch ftplistparser @@ -26,7 +28,7 @@ lib574 FTP wildcard download - changed fnmatch, 2x perform (DOS LIST response) -ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/*.txt +"ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/*.txt" @@ -36,24 +38,49 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/*.txt 0 - -^RETR.* -^EPSV.* -^PWD.* -^CWD.* -^TYPE.* -^LIST.* - - -s/USER.*/USER/ -s/PASS.*/PASS/ -s/QUIT.*/QUIT/ - -# THERE SHOULD NOT BE "SIZE"! and once "USER && PASS" +# THERE SHOULD NOT BE "SIZE"! and one "USER/PASS" -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 This file should have permissions 444 diff --git a/tests/data/test1200 b/tests/data/test1200 index 4e15ec9..ba1159f 100644 --- a/tests/data/test1200 +++ b/tests/data/test1200 @@ -1,4 +1,3 @@ -# Gopher directory fetch diff --git a/tests/data/test1201 b/tests/data/test1201 index ae5ebd1..81a9fe4 100644 --- a/tests/data/test1201 +++ b/tests/data/test1201 @@ -1,4 +1,3 @@ -# Gopher selector fetch diff --git a/tests/data/test1202 b/tests/data/test1202 index 253d42c..37d270a 100644 --- a/tests/data/test1202 +++ b/tests/data/test1202 @@ -1,4 +1,3 @@ -# Gopher query fetch @@ -27,7 +26,7 @@ gopher Gopher query -gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine?query%20succeeded/1202 +"gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine?query%20succeeded/1202" diff --git a/tests/data/test1203 b/tests/data/test1203 index 318cd01..3cb83be 100644 --- a/tests/data/test1203 +++ b/tests/data/test1203 @@ -1,4 +1,3 @@ -# Gopher IPv6 connectivity test @@ -20,6 +19,9 @@ iMenu results error.host 1 # Client-side + +ipv6 + gopher-ipv6 @@ -27,7 +29,7 @@ gopher-ipv6 Gopher IPv6 index --g "gopher://%HOSTIP:%GOPHER6PORT/1/moo/1203" +-g gopher://%HOSTIP:%GOPHER6PORT/1/moo/1203 diff --git a/tests/data/test574 b/tests/data/test574 index 9d50045..1fa4654 100644 --- a/tests/data/test574 +++ b/tests/data/test574 @@ -2,6 +2,8 @@ FTP +LIST +RETR wildcardmatch ftplistparser @@ -36,24 +38,49 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*.txt 0 - -^RETR.* -^EPSV.* -^PWD.* -^CWD.* -^TYPE.* -^LIST.* - - -s/USER.*/USER/ -s/PASS.*/PASS/ -s/QUIT.*/QUIT/ - -# THERE SHOULD NOT BE "SIZE"! and once "USER && PASS" +# THERE SHOULD NOT BE "SIZE"! and one "USER/PASS" -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 This file should have permissions 444 diff --git a/tests/data/test575 b/tests/data/test575 index c460467..5670e6b 100644 --- a/tests/data/test575 +++ b/tests/data/test575 @@ -2,6 +2,7 @@ FTP +RETR multi wildcardmatch ftplistparser @@ -23,7 +24,7 @@ ftp lib575 -FTP wildcard download - dup_handle && multi interface +FTP wildcard download - dup_handle and multi interface ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/* @@ -31,32 +32,73 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/* # Verify data after the test has been "shot" - -^RETR.* -^EPSV.* -^CWD.* -^PWD.* -^TYPE.* - - -s/^USER.*/USER/ -s/^PASS.*/PASS/ -s/^LIST.*/LIST/ -s/^QUIT.*/QUIT/ - 0 -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 This file should have permissions 444 -- 2.7.4