luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: postcheck is now in verify

Browse Source 
Also introduce 'notexists' for verifying that directory entries do not
exist after a test. Now an explicit supported feature instead of using
"funny" perl in postcheck.

Closes #15046
This commit is contained in:
Daniel Stenberg 2024-09-25 23:36:05 +02:00
parent 7060b9b082
commit 56183c1d6f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
73 changed files with 260 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/FILEFORMAT.md
View File

@ -510,10 +510,6 @@ output is displayed by the command or if the return code is non-zero, the test
is skipped and the (single-line) output is displayed as reason for not running is skipped and the (single-line) output is displayed as reason for not running
the test. the test.
### `<postcheck>`
A command line that if set gets run by the test script after the test. If the
command exists with a non-zero status code, the test is considered failed.
### `<tool>` ### `<tool>`
Name of tool to invoke instead of "curl". This tool must be built and exist Name of tool to invoke instead of "curl". This tool must be built and exist
either in the `libtest/` directory (if the tool name starts with `lib`) or in either in the `libtest/` directory (if the tool name starts with `lib`) or in
@ -622,6 +618,14 @@ changing protocol data such as port numbers or user-agent strings.
One perl op per line that operates on the protocol dump. This is pretty One perl op per line that operates on the protocol dump. This is pretty
advanced. Example: `s/^EPRT .*/EPRT stripped/`. advanced. Example: `s/^EPRT .*/EPRT stripped/`.
### `<postcheck>`
A command line that if set gets run by the test script after the test. If the
command exists with a non-zero status code, the test is considered failed.
### `<notexists>`
A list of directory entries that are checked for after the test has completed
and that must not exist. A listed entry existing causes the test to fail.
### `<protocol [nonewline="yes"][crlf="yes"]>` ### `<protocol [nonewline="yes"][crlf="yes"]>`
the protocol dump curl should transmit, if `nonewline` is set, we cut off the the protocol dump curl should transmit, if `nonewline` is set, we cut off the

6
tests/data/test1013
View File

@ -22,14 +22,14 @@ Compare curl --version with curl-config --protocols
<command> <command>
--version --version
</command> </command>
<postcheck>
%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER protocols
</postcheck>
</client> </client>
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER protocols
</postcheck>
<errorcode> <errorcode>
0 0
</errorcode> </errorcode>

6
tests/data/test1014
View File

@ -22,14 +22,14 @@ Compare curl --version with curl-config --features
<command> <command>
--version --version
</command> </command>
<postcheck>
%SRCDIR/libtest/test1013.pl ../curl-config %LOGDIR/stdout%TESTNUMBER features
</postcheck>
</client> </client>
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
%SRCDIR/libtest/test1013.pl ../curl-config %LOGDIR/stdout%TESTNUMBER features
</postcheck>
<errorcode> <errorcode>
0 0
</errorcode> </errorcode>

6
tests/data/test1022
View File

@ -22,14 +22,14 @@ Compare curl --version with curl-config --version
<command> <command>
--version --version
</command> </command>
<postcheck>
%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER version
</postcheck>
</client> </client>
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER version
</postcheck>
<errorcode> <errorcode>
0 0
</errorcode> </errorcode>

6
tests/data/test1023
View File

@ -22,14 +22,14 @@ Compare curl --version with curl-config --vernum
<command> <command>
--version --version
</command> </command>
<postcheck>
%SRCDIR/libtest/test1022.pl ../curl-config %LOGDIR/stdout%TESTNUMBER vernum
</postcheck>
</client> </client>
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
%SRCDIR/libtest/test1022.pl ../curl-config %LOGDIR/stdout%TESTNUMBER vernum
</postcheck>
<errorcode> <errorcode>
0 0
</errorcode> </errorcode>

10
tests/data/test1026
View File

@ -25,16 +25,16 @@ curl --manual
<command> <command>
--manual --manual
</command> </command>
# Search for these two sentinel lines in the manual output; if they are found,
# then chances are good the entire manual is there.
<postcheck>
perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(AUTHORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' %LOGDIR/stdout%TESTNUMBER
</postcheck>
</client> </client>
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
# Search for these two sentinel lines in the manual output; if they are found,
# then chances are good the entire manual is there.
<postcheck>
perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(AUTHORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' %LOGDIR/stdout%TESTNUMBER
</postcheck>
<errorcode> <errorcode>
0 0
</errorcode> </errorcode>

10
tests/data/test1027
View File

@ -22,11 +22,6 @@ curl --help
<command> <command>
--help --help
</command> </command>
# Search for these two sentinel lines in the help output; if they are found,
# then chances are good the entire help is there.
<postcheck>
perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' %LOGDIR/stdout%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -35,5 +30,10 @@ perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show ver
<errorcode> <errorcode>
0 0
</errorcode> </errorcode>
# Search for these two sentinel lines in the help output; if they are found,
# then chances are good the entire help is there.
<postcheck>
perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' %LOGDIR/stdout%TESTNUMBER
</postcheck>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1182
View File

@ -21,16 +21,15 @@ Verify that runtests.pl accepts an exclude file with the -E option
<precheck> <precheck>
mkdir %LOGDIR/data ; mkdir %LOGDIR/log; cp %SRCDIR/data/test1 %LOGDIR/data; echo 'test:1:Test should not run for unit test %TESTNUMBER' > %LOGDIR/test%TESTNUMBER-exclude-file mkdir %LOGDIR/data ; mkdir %LOGDIR/log; cp %SRCDIR/data/test1 %LOGDIR/data; echo 'test:1:Test should not run for unit test %TESTNUMBER' > %LOGDIR/test%TESTNUMBER-exclude-file
</precheck> </precheck>
<postcheck>
grep -q "Test should not run for unit test %TESTNUMBER" %LOGDIR/stdout%TESTNUMBER
</postcheck>
</client> </client>
<verify> <verify>
<errorcode> <errorcode>
1 1
</errorcode> </errorcode>
<postcheck>
grep -q "Test should not run for unit test %TESTNUMBER" %LOGDIR/stdout%TESTNUMBER
</postcheck>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1336
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -74,6 +71,8 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1337
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -71,6 +68,8 @@ Content-Type: text/html
Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
</file2> </file2>
<notexists>>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1344
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -82,6 +79,8 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1345
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -79,6 +76,8 @@ Content-Type: text/html
Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
</file2> </file2>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1347
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -71,6 +68,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
<file2 name="%LOGDIR/stdout%TESTNUMBER"> <file2 name="%LOGDIR/stdout%TESTNUMBER">
</file2> </file2>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1356
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -77,6 +74,8 @@ MOOOO
<file2 name="%LOGDIR/stdout%TESTNUMBER"> <file2 name="%LOGDIR/stdout%TESTNUMBER">
</file2> </file2>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1357
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -97,6 +94,8 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1358
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -95,5 +92,8 @@ MOOOO
s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
</stripfile2> </stripfile2>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1359
View File

@ -42,9 +42,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -99,5 +96,8 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1360
View File

@ -42,9 +42,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -96,5 +93,8 @@ MOOOO
s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
</stripfile2> </stripfile2>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1361
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -98,5 +95,8 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1362
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -95,5 +92,8 @@ MOOOO
s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
</stripfile2> </stripfile2>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1363
View File

@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -78,5 +75,8 @@ MOOOO
<file2 name="%LOGDIR/stdout%TESTNUMBER"> <file2 name="%LOGDIR/stdout%TESTNUMBER">
</file2> </file2>
<notexists>
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1364
View File

@ -32,9 +32,6 @@ HTTP GET -o fname without Content-Disposition, -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -65,5 +62,8 @@ Content-Type: text/html
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1365
View File

@ -32,9 +32,6 @@ HTTP GET -o fname without Content-Disposition, -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D - http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -62,5 +59,8 @@ Content-Type: text/html
</file2> </file2>
<notexists>
%LOGDIR/%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1366
View File

@ -33,9 +33,6 @@ HTTP GET -o fname and Content-Disposition, -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -67,5 +64,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1367
View File

@ -33,9 +33,6 @@ HTTP GET -o fname and Content-Disposition, -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D - http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -64,5 +61,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
</file2> </file2>
<notexists>
%LOGDIR/%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1368
View File

@ -33,9 +33,6 @@ HTTP GET -o fname -J without Content-Disposition, -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -66,5 +63,8 @@ Content-Type: text/html
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1369
View File

@ -33,9 +33,6 @@ HTTP GET -o fname -J without Content-Disposition, -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D - http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -63,5 +60,8 @@ Content-Type: text/html
</file2> </file2>
<notexists>
%LOGDIR/%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1370
View File

@ -34,9 +34,6 @@ HTTP GET -o fname -J and Content-Disposition, -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -68,5 +65,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1371
View File

@ -34,9 +34,6 @@ HTTP GET -o fname -J and Content-Disposition, -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D - http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -65,5 +62,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
</file2> </file2>
<notexists>
%LOGDIR/%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1372
View File

@ -32,9 +32,6 @@ HTTP GET -o fname -i without Content-Disposition, -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -72,5 +69,8 @@ Content-Type: text/html
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1373
View File

@ -32,9 +32,6 @@ HTTP GET -o fname -i without Content-Disposition, -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D - http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -69,5 +66,8 @@ Content-Type: text/html
</file2> </file2>
<notexists>
%LOGDIR/%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1374
View File

@ -33,9 +33,6 @@ HTTP GET -o fname -i and Content-Disposition, -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -75,5 +72,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1375
View File

@ -33,9 +33,6 @@ HTTP GET -o fname -i and Content-Disposition, -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D - http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -72,5 +69,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
</file2> </file2>
<notexists>
%LOGDIR/%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1376
View File

@ -32,9 +32,6 @@ HTTP GET -o fname -i without Content-Disposition, without -D
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -62,5 +59,8 @@ Content-Type: text/html
<file2 name="%LOGDIR/stdout%TESTNUMBER"> <file2 name="%LOGDIR/stdout%TESTNUMBER">
</file2> </file2>
<notexists>
%LOGDIR/%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1377
View File

@ -33,9 +33,6 @@ HTTP GET -o fname -i and Content-Disposition, without -D
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -63,6 +60,10 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
<file2 name="%LOGDIR/stdout%TESTNUMBER"> <file2 name="%LOGDIR/stdout%TESTNUMBER">
</file2> </file2>
<notexists>
%LOGDIR/%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1378
View File

@ -25,9 +25,6 @@ FTP DL, file without Content-Disposition inside, using -o fname
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -54,6 +51,9 @@ mooo
<file2 name="%LOGDIR/stdout%TESTNUMBER"> <file2 name="%LOGDIR/stdout%TESTNUMBER">
</file2> </file2>
<notexists>
%LOGDIR/file%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1379
View File

@ -25,9 +25,6 @@ FTP DL, file without C-D inside, using -o fname -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -75,5 +72,8 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/file%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1380
View File

@ -25,9 +25,6 @@ FTP DL, file without C-D inside, using -o fname -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D - ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -72,5 +69,8 @@ mooo
s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
</stripfile2> </stripfile2>
<notexists>
%LOGDIR/file%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1381
View File

@ -26,9 +26,6 @@ FTP DL, file without C-D inside, using -o fname -J -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D %LOGDIR/heads%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -76,5 +73,8 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/file%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1382
View File

@ -26,9 +26,6 @@ FTP DL, file without C-D inside, using -o fname -J -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D - ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -73,5 +70,8 @@ mooo
s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
</stripfile2> </stripfile2>
<notexists>
%LOGDIR/file%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1383
View File

@ -25,9 +25,6 @@ FTP DL, file without C-D inside, using -o fname -i -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D %LOGDIR/heads%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -75,5 +72,8 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/file%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1384
View File

@ -25,9 +25,6 @@ FTP DL, file without C-D inside, using -o fname -i -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D - ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -72,5 +69,8 @@ mooo
s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
</stripfile2> </stripfile2>
<notexists>
%LOGDIR/file%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1385
View File

@ -25,9 +25,6 @@ FTP DL, file without C-D inside, using -o fname -i, without -D
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -55,5 +52,8 @@ mooo
<file2 name="%LOGDIR/stdout%TESTNUMBER"> <file2 name="%LOGDIR/stdout%TESTNUMBER">
</file2> </file2>
<notexists>
%LOGDIR/file%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1386
View File

@ -33,9 +33,6 @@ FTP DL, file with Content-Disposition inside, using -o fname
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -70,5 +67,9 @@ MOOOO
<file2 name="%LOGDIR/stdout%TESTNUMBER"> <file2 name="%LOGDIR/stdout%TESTNUMBER">
</file2> </file2>
<notexists>
%LOGDIR/file%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1387
View File

@ -33,9 +33,6 @@ FTP DL, file with C-D inside, using -o fname -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -90,5 +87,9 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/file%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1388
View File

@ -33,9 +33,6 @@ FTP DL, file with C-D inside, using -o fname -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D - ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -86,6 +83,10 @@ MOOOO
<stripfile2> <stripfile2>
s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
</stripfile2> </stripfile2>
<notexists>
%LOGDIR/file%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1389
View File

@ -34,9 +34,6 @@ FTP DL, file with C-D inside, using -o fname -J -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D %LOGDIR/heads%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -90,6 +87,10 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/file%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1390
View File

@ -34,9 +34,6 @@ FTP DL, file with C-D inside, using -o fname -J -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D - ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -88,5 +85,9 @@ MOOOO
s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
</stripfile2> </stripfile2>
<notexists>
%LOGDIR/file%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1391
View File

@ -33,9 +33,6 @@ FTP DL, file with C-D inside, using -o fname -i -D file
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D %LOGDIR/heads%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D %LOGDIR/heads%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -90,5 +87,9 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
<file3 name="%LOGDIR/stdout%TESTNUMBER"> <file3 name="%LOGDIR/stdout%TESTNUMBER">
</file3> </file3>
<notexists>
%LOGDIR/file%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1392
View File

@ -33,9 +33,6 @@ FTP DL, file with C-D inside, using -o fname -i -D stdout
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D - ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D -
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -87,5 +84,9 @@ MOOOO
s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
</stripfile2> </stripfile2>
<notexists>
%LOGDIR/file%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

7
tests/data/test1393
View File

@ -33,9 +33,6 @@ FTP DL, file with C-D inside, using -o fname -i, without -D
<command option="no-output,no-include"> <command option="no-output,no-include">
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -70,5 +67,9 @@ MOOOO
<file2 name="%LOGDIR/stdout%TESTNUMBER"> <file2 name="%LOGDIR/stdout%TESTNUMBER">
</file2> </file2>
<notexists>
%LOGDIR/file%TESTNUMBER
%LOGDIR/name%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1423
View File

@ -32,9 +32,6 @@ HTTP GET -o fname without Content-Disposition (empty file)
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER file://%PWD/%LOGDIR/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER file://%PWD/%LOGDIR/outfile%TESTNUMBER
</command> </command>
<postcheck>
perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
</postcheck>
</client> </client>
# #
@ -51,5 +48,8 @@ Accept: */*
<file1 name="%LOGDIR/outfile%TESTNUMBER"> <file1 name="%LOGDIR/outfile%TESTNUMBER">
</file1> </file1>
<notexists>
%LOGDIR/%TESTNUMBER
</notexists>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1443
View File

@ -44,9 +44,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time
</command> </command>
# Verify the mtime of the file. The mtime is specifically chosen to be an even # Verify the mtime of the file. The mtime is specifically chosen to be an even
# number so that it can be represented exactly on a FAT filesystem. # number so that it can be represented exactly on a FAT filesystem.
<postcheck>
perl -e 'exit((stat("%LOGDIR/%TESTNUMBER"))[9] != 960898200)'
</postcheck>
</client> </client>
# #
@ -62,5 +59,8 @@ Accept: */*
<file name="%LOGDIR/%TESTNUMBER"> <file name="%LOGDIR/%TESTNUMBER">
12345 12345
</file> </file>
<postcheck>
perl -e 'exit((stat("%LOGDIR/%TESTNUMBER"))[9] != 960898200)'
</postcheck>
</verify> </verify>
</testcase> </testcase>

10
tests/data/test1444
View File

@ -28,11 +28,6 @@ FTP with --remote-time
<command> <command>
ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time
</command> </command>
# Verify the mtime of the file. The mtime is specifically chosen to be an even
# number so that it can be represented exactly on a FAT filesystem.
<postcheck>
perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 1234567890)'
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
@ -51,5 +46,10 @@ SIZE %TESTNUMBER
RETR %TESTNUMBER RETR %TESTNUMBER
QUIT QUIT
</protocol> </protocol>
# Verify the mtime of the file. The mtime is specifically chosen to be an even
# number so that it can be represented exactly on a FAT filesystem.
<postcheck>
perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 1234567890)'
</postcheck>
</verify> </verify>
</testcase> </testcase>

8
tests/data/test1445
View File

@ -23,13 +23,13 @@ file:// with --remote-time
<command> <command>
file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt --remote-time file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt --remote-time
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \
perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 946728000)'
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \
perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 946728000)'
</postcheck>
</verify> </verify>
</testcase> </testcase>

8
tests/data/test1446
View File

@ -26,14 +26,14 @@ SFTP with --remote-time
<command> <command>
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/rofile.txt --insecure --remote-time --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/rofile.txt --insecure --remote-time
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \
perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 978264000)'
</postcheck>
</client> </client>
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \
perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 978264000)'
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test1683
View File

@ -41,9 +41,6 @@ to stay the same
<precheck> <precheck>
perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; open(FH, ">", $filename) or die $!; print FH "to stay the same" ; close(FH) }' perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; open(FH, ">", $filename) or die $!; print FH "to stay the same" ; close(FH) }'
</precheck> </precheck>
<postcheck>
perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; open(FH, "<", $filename) or die $!; (<FH> eq "to stay the same" and <FH> eq "") or die "incorrect $filename" ; close(FH) }'
</postcheck>
</client> </client>
# #
@ -55,5 +52,8 @@ perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; op
<file name="%LOGDIR/exist%TESTNUMBER"> <file name="%LOGDIR/exist%TESTNUMBER">
to stay the same to stay the same
</file> </file>
<postcheck>
perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; open(FH, "<", $filename) or die $!; (<FH> eq "to stay the same" and <FH> eq "") or die "incorrect $filename" ; close(FH) }'
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test608
View File

@ -28,9 +28,6 @@ SFTP post-quote rename
</command> </command>
# Verify that the file was renamed properly, then rename the file back to what # Verify that the file was renamed properly, then rename the file back to what
# it was so the verify section works and the file can be cleaned up. # it was so the verify section works and the file can be cleaned up.
<postcheck>
perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/file%TESTNUMBER.txt move %PWD/%LOGDIR/file%TESTNUMBER-renamed.txt %PWD/%LOGDIR/file%TESTNUMBER.txt
</postcheck>
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Test file for rename test Test file for rename test
</file> </file>
@ -42,5 +39,8 @@ Test file for rename test
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Test file for rename test Test file for rename test
</file> </file>
<postcheck>
perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/file%TESTNUMBER.txt move %PWD/%LOGDIR/file%TESTNUMBER-renamed.txt %PWD/%LOGDIR/file%TESTNUMBER.txt
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test610
View File

@ -29,9 +29,6 @@ SFTP post-quote rmdir
<command> <command>
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/%LOGDIR/test%TESTNUMBER.dir
</postcheck>
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Dummy test file for rmdir test Dummy test file for rmdir test
</file> </file>
@ -40,5 +37,8 @@ Dummy test file for rmdir test
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/%LOGDIR/test%TESTNUMBER.dir
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test611
View File

@ -29,9 +29,6 @@ SFTP post-quote rename
<command> <command>
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
</postcheck>
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Dummy test file for rename test Dummy test file for rename test
</file> </file>
@ -40,5 +37,8 @@ Dummy test file for rename test
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test612
View File

@ -26,9 +26,6 @@ SFTP post-quote remove file
<command> <command>
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt -Q "-rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt -Q "-rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
</postcheck>
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Dummy test file for remove test Dummy test file for remove test
</file> </file>
@ -40,5 +37,8 @@ Dummy test file for remove test
<upload> <upload>
Dummy test file for remove test Dummy test file for remove test
</upload> </upload>
<postcheck>
perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test613
View File

@ -31,13 +31,13 @@ SFTP directory retrieval
<command> <command>
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
</postcheck>
</client> </client>
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
perl %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test614
View File

@ -32,13 +32,13 @@ SFTP pre-quote chmod
<command> <command>
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
</postcheck>
</client> </client>
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test615
View File

@ -22,9 +22,6 @@ SFTP put remote failure
<command> <command>
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/rofile.txt --insecure --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/rofile.txt --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir
</postcheck>
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Test data Test data
for ssh upload test for ssh upload test
@ -37,5 +34,8 @@ for ssh upload test
<errorcode> <errorcode>
9 9
</errorcode> </errorcode>
<postcheck>
perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test624
View File

@ -24,9 +24,6 @@ SFTP put with --ftp-create-dirs
<command> <command>
--ftp-create-dirs --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/upload.%TESTNUMBER --insecure --ftp-create-dirs --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/upload.%TESTNUMBER --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test610.pl move %PWD/%LOGDIR/test%TESTNUMBER.dir/upload.%TESTNUMBER %PWD/%LOGDIR/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
</postcheck>
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Test data Test data
for ssh upload test for ssh upload test
@ -40,5 +37,8 @@ for ssh upload test
Test data Test data
for ssh upload test for ssh upload test
</upload> </upload>
<postcheck>
perl %SRCDIR/libtest/test610.pl move %PWD/%LOGDIR/test%TESTNUMBER.dir/upload.%TESTNUMBER %PWD/%LOGDIR/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test625
View File

@ -24,9 +24,6 @@ SFTP put with --ftp-create-dirs twice
<command> <command>
--ftp-create-dirs --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.a/upload.%TESTNUMBER -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.b/upload.%TESTNUMBER --insecure --ftp-create-dirs --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.a/upload.%TESTNUMBER -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.b/upload.%TESTNUMBER --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test610.pl move %PWD/%LOGDIR/test%TESTNUMBER.a/upload.%TESTNUMBER %PWD/%LOGDIR/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.a rm %PWD/%LOGDIR/test%TESTNUMBER.b/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.b
</postcheck>
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Test data Test data
for ssh upload test for ssh upload test
@ -40,5 +37,8 @@ for ssh upload test
Test data Test data
for ssh upload test for ssh upload test
</upload> </upload>
<postcheck>
perl %SRCDIR/libtest/test610.pl move %PWD/%LOGDIR/test%TESTNUMBER.a/upload.%TESTNUMBER %PWD/%LOGDIR/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.a rm %PWD/%LOGDIR/test%TESTNUMBER.b/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.b
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test627
View File

@ -26,9 +26,6 @@ SFTP quote remove file with NOBODY
<command> <command>
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -I -Q "rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT --insecure --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -I -Q "rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
</postcheck>
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Dummy test file for remove test Dummy test file for remove test
</file> </file>
@ -39,5 +36,8 @@ Dummy test file for remove test
<verify> <verify>
<protocol> <protocol>
</protocol> </protocol>
<postcheck>
perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test638
View File

@ -31,9 +31,6 @@ SFTP post-quote rename * asterisk accept-fail
<command> <command>
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
</postcheck>
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Dummy test file for rename test Dummy test file for rename test
</file> </file>
@ -42,5 +39,8 @@ Dummy test file for rename test
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
</postcheck>
</verify> </verify>
</testcase> </testcase>

6
tests/data/test639
View File

@ -31,9 +31,6 @@ SFTP post-quote rename * asterisk accept-fail
<command> <command>
--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER-not-exists-dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER-not-exists-dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
</command> </command>
<postcheck>
perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
</postcheck>
<file name="%LOGDIR/file%TESTNUMBER.txt"> <file name="%LOGDIR/file%TESTNUMBER.txt">
Dummy test file for rename test Dummy test file for rename test
</file> </file>
@ -42,5 +39,8 @@ Dummy test file for rename test
# #
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<postcheck>
perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
</postcheck>
</verify> </verify>
</testcase> </testcase>

2
tests/libtest/Makefile.am
View File

@ -38,7 +38,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/tests/libtest -I$(top_srcdir)/tests/libtest
EXTRA_DIST = test307.pl test610.pl test613.pl test1013.pl test1022.pl \ EXTRA_DIST = test307.pl test610.pl test613.pl test1013.pl test1022.pl \
notexists.pl CMakeLists.txt mk-lib1521.pl .checksrc CMakeLists.txt mk-lib1521.pl .checksrc
CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@ CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@

38
tests/libtest/notexists.pl
View File

@ -1,38 +0,0 @@
#!/usr/bin/env perl
#***************************************************************************
# _ _ ____ _
# Project ___| | | | _ \| |
# / __| | | | |_) | |
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
# are also available at https://curl.se/docs/copyright.html.
#
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
# copies of the Software, and permit persons to whom the Software is
# furnished to do so, under the terms of the COPYING file.
#
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
# KIND, either express or implied.
#
# SPDX-License-Identifier: curl
#
###########################################################################
# Check that given arguments do not exist on filesystem.
my $code = 0;
if ($#ARGV < 0) {
print "Usage: $0 file1 [fileN]\n";
exit 2;
}
while (@ARGV) {
my $fname = shift @ARGV;
if (-e $fname) {
print "Found '$fname' when not supposed to exist.\n";
$code = 1;
}
}
exit $code;

5
tests/runner.pm
View File

@ -1130,6 +1130,11 @@ sub singletest_postcheck {
# run the postcheck command # run the postcheck command
my @postcheck= getpart("client", "postcheck"); my @postcheck= getpart("client", "postcheck");
if(@postcheck) {
die "test$testnum uses client/postcheck";
}
@postcheck= getpart("verify", "postcheck");
if(@postcheck) { if(@postcheck) {
my $cmd = join("", @postcheck); my $cmd = join("", @postcheck);
chomp $cmd; chomp $cmd;

19
tests/runtests.pl
View File

@ -1714,6 +1714,25 @@ sub singletest_check {
$ok .= "-"; # memory not checked $ok .= "-"; # memory not checked
} }
my @notexists = getpart("verify", "notexists");
if(@notexists) {
# a list of directory entries that must not exist
my $err;
while (@notexists) {
my $fname = shift @notexists;
chomp $fname;
if (-e $fname) {
logmsg "Found '$fname' when not supposed to exist.\n";
$err++;
}
elsif($verbose) {
logmsg "Found '$fname' confirmed to not exist.\n";
}
}
if($err) {
return -1;
}
}
if($valgrind) { if($valgrind) {
if($usedvalgrind) { if($usedvalgrind) {
if(!opendir(DIR, "$logdir")) { if(!opendir(DIR, "$logdir")) {