tests: postcheck is now in verify

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

diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index b0c4de5ef16de7662f5c327ae4762292547e7091..7ab1583057d222a5b7b7a2d06d603034b803dab6 100644 (file)
--- a/tests/FILEFORMAT.md
+++ b/tests/FILEFORMAT.md
@@ -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
 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>`
 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
@@ -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
 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"]>`
 
 the protocol dump curl should transmit, if `nonewline` is set, we cut off the

diff --git a/tests/data/test1013 b/tests/data/test1013
index d748657b5df28117624505a7a5afe95615c6b7c4..87e99cd56beab7976a3c981bbd8a61670c89eb87 100644 (file)
--- a/tests/data/test1013
+++ b/tests/data/test1013
@@ -22,14 +22,14 @@ Compare curl --version with curl-config --protocols
 <command>
 --version
 </command>
-<postcheck>
-%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER protocols
-</postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
+<postcheck>
+%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER protocols
+</postcheck>
 <errorcode>
 0
 </errorcode>

diff --git a/tests/data/test1014 b/tests/data/test1014
index f03ac859db44567aa437de59be71ec578eccab42..a8f0a3b1d2799a59812af0e5a76eda0c92842001 100644 (file)
--- a/tests/data/test1014
+++ b/tests/data/test1014
@@ -22,14 +22,14 @@ Compare curl --version with curl-config --features
 <command>
 --version
 </command>
-<postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config %LOGDIR/stdout%TESTNUMBER features
-</postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
+<postcheck>
+%SRCDIR/libtest/test1013.pl ../curl-config %LOGDIR/stdout%TESTNUMBER features
+</postcheck>
 <errorcode>
 0
 </errorcode>

diff --git a/tests/data/test1022 b/tests/data/test1022
index 6a5dd2180a660bb3f7409dea9e597013fc02c957..597dfd05d05a7dd2b8bd53f76f8308e197dfd6a1 100644 (file)
--- a/tests/data/test1022
+++ b/tests/data/test1022
@@ -22,14 +22,14 @@ Compare curl --version with curl-config --version
 <command>
 --version
 </command>
-<postcheck>
-%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER version
-</postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
+<postcheck>
+%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER version
+</postcheck>
 <errorcode>
 0
 </errorcode>

diff --git a/tests/data/test1023 b/tests/data/test1023
index 1d8cbfb4c06ad8ae664c701f9fb104adee5ab286..70e027aa8c6b9482465d6904783d08eee3464554 100644 (file)
--- a/tests/data/test1023
+++ b/tests/data/test1023
@@ -22,14 +22,14 @@ Compare curl --version with curl-config --vernum
 <command>
 --version
 </command>
-<postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config %LOGDIR/stdout%TESTNUMBER vernum
-</postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
+<postcheck>
+%SRCDIR/libtest/test1022.pl ../curl-config %LOGDIR/stdout%TESTNUMBER vernum
+</postcheck>
 <errorcode>
 0
 </errorcode>

diff --git a/tests/data/test1026 b/tests/data/test1026
index e310e6962d70dd1f0ed701b0dc3b2b5ff164426a..9090bdb066b5756d9789f915e1da1a8993a55a68 100644 (file)
--- a/tests/data/test1026
+++ b/tests/data/test1026
@@ -25,16 +25,16 @@ curl --manual
 <command>
 --manual
 </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>
 
 #
 # Verify data after the test has been "shot"
 <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>
 0
 </errorcode>

diff --git a/tests/data/test1027 b/tests/data/test1027
index 1d076000b04e913306c63e90f8e4929905463e0d..64d193227567a92bbe05bc495a8b63d17e8648ca 100644 (file)
--- a/tests/data/test1027
+++ b/tests/data/test1027
@@ -22,11 +22,6 @@ curl --help
 <command>
 --help
 </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>
 
 #
@@ -35,5 +30,10 @@ perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show ver
 <errorcode>
 0
 </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>
 </testcase>

diff --git a/tests/data/test1182 b/tests/data/test1182
index d1b8fb07b4d38820605c84b81540a62567b0d9e1..118b967b3e8953f1bbd618496368400211d2872f 100644 (file)
--- a/tests/data/test1182
+++ b/tests/data/test1182
@@ -21,16 +21,15 @@ Verify that runtests.pl accepts an exclude file with the -E option
 <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
 </precheck>
-<postcheck>
-grep -q "Test should not run for unit test %TESTNUMBER" %LOGDIR/stdout%TESTNUMBER
-</postcheck>
-
 </client>
 
 <verify>
 <errorcode>
 1
 </errorcode>
+<postcheck>
+grep -q "Test should not run for unit test %TESTNUMBER" %LOGDIR/stdout%TESTNUMBER
+</postcheck>
 </verify>
 
 </testcase>

diff --git a/tests/data/test1336 b/tests/data/test1336
index 98579bf301a9218b0728937ecab9656110badea7..9527f168971ca40869cd09c9af12b5752e008feb 100644 (file)
--- a/tests/data/test1336
+++ b/tests/data/test1336
@@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -74,6 +71,8 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 <file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
-
+<notexists>
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

diff --git a/tests/data/test1337 b/tests/data/test1337
index 149fb247118a2a39b0acebaf914da58554e065a4..b54abb6ce29566df1c50f37b9ec070f411455a33 100644 (file)
--- a/tests/data/test1337
+++ b/tests/data/test1337
@@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D -
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -71,6 +68,8 @@ Content-Type: text/html
 Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
-
+<notexists>>
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

diff --git a/tests/data/test1344 b/tests/data/test1344
index b0e9f960a63ac1ee8f6a4d67c6893160f4fd48d2..bd6cee0d237731caf951c9a9587a2e363fa110a1 100644 (file)
--- a/tests/data/test1344
+++ b/tests/data/test1344
@@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -82,6 +79,8 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 <file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
-
+<notexists>
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

diff --git a/tests/data/test1345 b/tests/data/test1345
index 456ec497010122f47e27aacfd9d48b29b0f10494..2b2fcf9b0fb0303833a4c5732d89b54ad91c8842 100644 (file)
--- a/tests/data/test1345
+++ b/tests/data/test1345
@@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D -
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -79,6 +76,8 @@ Content-Type: text/html
 Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
 </file2>
-
+<notexists>
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

diff --git a/tests/data/test1347 b/tests/data/test1347
index 0b7ec82660ef579831d2bec9f024026133d18198..1f683740d5f6323ca5bb566fb9e6cc6301d1cf1b 100644 (file)
--- a/tests/data/test1347
+++ b/tests/data/test1347
@@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -71,6 +68,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
+<notexists>
+%LOGDIR/name%TESTNUMBER
+</notexists>
 
 </verify>
 </testcase>

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

diff --git a/tests/data/test1357 b/tests/data/test1357
index c273085704574e7915380b6db128164d8a1961b7..f03aeadf99b5aa1040ba8d16d42bca06694feba2 100644 (file)
--- a/tests/data/test1357
+++ b/tests/data/test1357
@@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 # 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>
-
+<notexists>
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

diff --git a/tests/data/test1359 b/tests/data/test1359
index 38ebef01349bef97c14259fb001c37e19936fef9..8f5d08a70808322e47e02719acff12fa81c0e33a 100644 (file)
--- a/tests/data/test1359
+++ b/tests/data/test1359
@@ -42,9 +42,6 @@ CURL_TESTDIR=%LOGDIR
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 # 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>
 
+<notexists>
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

diff --git a/tests/data/test1361 b/tests/data/test1361
index 20a014143c76a4b9289ada265cabf69bc85bdee7..29a3a663d85436f6e5009df62836ab65da659889 100644 (file)
--- a/tests/data/test1361
+++ b/tests/data/test1361
@@ -41,9 +41,6 @@ CURL_TESTDIR=%LOGDIR
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 # 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>
 
+<notexists>
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

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

diff --git a/tests/data/test1364 b/tests/data/test1364
index 0ea1e2b12e135f03a1fba4dc89485b563a39d3f3..2b3b566f6ab476126c6742aa9b5422340d2e0342 100644 (file)
--- a/tests/data/test1364
+++ b/tests/data/test1364
@@ -32,9 +32,6 @@ HTTP GET -o fname without Content-Disposition, -D file
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -65,5 +62,8 @@ Content-Type: text/html
 <file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
+<notexists>
+%LOGDIR/%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

diff --git a/tests/data/test1365 b/tests/data/test1365
index abd371c010163322a882ae5e61ebf5ef45527740..1a28a77ede8dae8ff0c3bfa97a70e5ae9227feb8 100644 (file)
--- a/tests/data/test1365
+++ b/tests/data/test1365
@@ -32,9 +32,6 @@ HTTP GET -o fname without Content-Disposition, -D stdout
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -62,5 +59,8 @@ Content-Type: text/html
 \r
 </file2>
 
+<notexists>
+%LOGDIR/%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

diff --git a/tests/data/test1366 b/tests/data/test1366
index 78f5573ea475176dbfe82e83b5c8faa62557e49c..1107c22811508cea65212fa8f7baafbcf7f76984 100644 (file)
--- a/tests/data/test1366
+++ b/tests/data/test1366
@@ -33,9 +33,6 @@ HTTP GET -o fname and Content-Disposition, -D file
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -67,5 +64,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 <file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
+<notexists>
+%LOGDIR/%TESTNUMBER
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

diff --git a/tests/data/test1367 b/tests/data/test1367
index 24929365a0a38b40972f8de1b22144a5617b0bd7..5d1efa3a955c111398bd316babcb28230416e15b 100644 (file)
--- a/tests/data/test1367
+++ b/tests/data/test1367
@@ -33,9 +33,6 @@ HTTP GET -o fname and Content-Disposition, -D stdout
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -64,5 +61,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 \r
 </file2>
 
+<notexists>
+%LOGDIR/%TESTNUMBER
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

diff --git a/tests/data/test1369 b/tests/data/test1369
index 48fd31806f0136e5eeabf241c4ede349e5b94dea..93627e6a484a4b08df2dd524770ecd257efd3c5d 100644 (file)
--- a/tests/data/test1369
+++ b/tests/data/test1369
@@ -33,9 +33,6 @@ HTTP GET -o fname -J without Content-Disposition, -D stdout
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -63,5 +60,8 @@ Content-Type: text/html
 \r
 </file2>
 
+<notexists>
+%LOGDIR/%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

diff --git a/tests/data/test1371 b/tests/data/test1371
index 8565363b93e9855ad9f202fe87fcd67fc9d7af5a..d05c1a15bf0022ffb09a6110ce85cfb5d833a99f 100644 (file)
--- a/tests/data/test1371
+++ b/tests/data/test1371
@@ -34,9 +34,6 @@ HTTP GET -o fname -J and Content-Disposition, -D stdout
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -65,5 +62,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 \r
 </file2>
 
+<notexists>
+%LOGDIR/%TESTNUMBER
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

diff --git a/tests/data/test1373 b/tests/data/test1373
index c475deb9f0c9f7867a628fc99ae051e65372dcd4..7d94775d6ffca4c77996bdc6f880148bcff082be 100644 (file)
--- a/tests/data/test1373
+++ b/tests/data/test1373
@@ -32,9 +32,6 @@ HTTP GET -o fname -i without Content-Disposition, -D stdout
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -69,5 +66,8 @@ Content-Type: text/html
 \r
 </file2>
 
+<notexists>
+%LOGDIR/%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

diff --git a/tests/data/test1375 b/tests/data/test1375
index 6df5526360fbc67ab2f738701c11b761bd729acc..f56a7d90b368a9b8e42a3e29a297e03675e5d539 100644 (file)
--- a/tests/data/test1375
+++ b/tests/data/test1375
@@ -33,9 +33,6 @@ HTTP GET -o fname -i and Content-Disposition, -D stdout
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -72,5 +69,9 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 \r
 </file2>
 
+<notexists>
+%LOGDIR/%TESTNUMBER
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

diff --git a/tests/data/test1376 b/tests/data/test1376
index f3d36e0af3a4a8136a1947a5982322bbb600a037..5b3280b0336e244a56687e0fc28a10ea122dd387 100644 (file)
--- a/tests/data/test1376
+++ b/tests/data/test1376
@@ -32,9 +32,6 @@ HTTP GET -o fname -i without Content-Disposition, without -D
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -62,5 +59,8 @@ Content-Type: text/html
 <file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
+<notexists>
+%LOGDIR/%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

diff --git a/tests/data/test1377 b/tests/data/test1377
index d1a6b72134f697c06c329035e0212462c60809df..4bdc864bc1ee90397f69d404bdfcde143d51e1bb 100644 (file)
--- a/tests/data/test1377
+++ b/tests/data/test1377
@@ -33,9 +33,6 @@ HTTP GET -o fname -i and Content-Disposition, without -D
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 #
@@ -63,6 +60,10 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
+<notexists>
+%LOGDIR/%TESTNUMBER
+%LOGDIR/name%TESTNUMBER
+</notexists>
 
 </verify>
 </testcase>

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

diff --git a/tests/data/test1379 b/tests/data/test1379
index c11dfe84c8847e5af05f3b080d7ad0374a31991a..9cecb0eae0ce46ad61d069a0cf44e5a9ebf5fbc8 100644 (file)
--- a/tests/data/test1379
+++ b/tests/data/test1379
@@ -25,9 +25,6 @@ FTP DL, file without C-D inside, using -o fname -D file
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
-</postcheck>
 </client>
 
 # 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>
 
+<notexists>
+%LOGDIR/file%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

diff --git a/tests/data/test1381 b/tests/data/test1381
index 404a03d0d832b15d823aeb92cbdd6a981ebddf45..28c2af5fe25482b712d7455efe27a93a3318c002 100644 (file)
--- a/tests/data/test1381
+++ b/tests/data/test1381
@@ -26,9 +26,6 @@ FTP DL, file without C-D inside, using -o fname -J -D file
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
-</postcheck>
 </client>
 
 # 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>
 
+<notexists>
+%LOGDIR/file%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

diff --git a/tests/data/test1383 b/tests/data/test1383
index f0c9cd68e293235b071294a50c7617ab522cfbd5..2c9f3329179fb79032b3e1177124e4dc4d7b6f0e 100644 (file)
--- a/tests/data/test1383
+++ b/tests/data/test1383
@@ -25,9 +25,6 @@ FTP DL, file without C-D inside, using -o fname -i -D file
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
-</postcheck>
 </client>
 
 # 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>
 
+<notexists>
+%LOGDIR/file%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

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

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

diff --git a/tests/data/test1387 b/tests/data/test1387
index 2965acea4d783cf72f7de4872b342ec332b536a5..6a24b76783a833d729c8bba3a27f2628e9b3d8dc 100644 (file)
--- a/tests/data/test1387
+++ b/tests/data/test1387
@@ -33,9 +33,6 @@ FTP DL, file with C-D inside, using -o fname -D file
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 # 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>
 
+<notexists>
+%LOGDIR/file%TESTNUMBER
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

diff --git a/tests/data/test1389 b/tests/data/test1389
index 3ce9acf11c4d8c8a7f58c15832d4981067d449c2..77f7b5f273ac72735afa56da33e4a39379843463 100644 (file)
--- a/tests/data/test1389
+++ b/tests/data/test1389
@@ -34,9 +34,6 @@ FTP DL, file with C-D inside, using -o fname -J -D file
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 # 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>
+<notexists>
+%LOGDIR/file%TESTNUMBER
+%LOGDIR/name%TESTNUMBER
+</notexists>
 
 </verify>
 </testcase>

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

diff --git a/tests/data/test1391 b/tests/data/test1391
index 4f612f99eec46b2c85df534fde02b6e1f741902f..c0c5bc58af391d2c7ac057d456277644ed68cbab 100644 (file)
--- a/tests/data/test1391
+++ b/tests/data/test1391
@@ -33,9 +33,6 @@ FTP DL, file with C-D inside, using -o fname -i -D file
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D %LOGDIR/heads%TESTNUMBER
 </command>
-<postcheck>
-perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
-</postcheck>
 </client>
 
 # 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>
 
+<notexists>
+%LOGDIR/file%TESTNUMBER
+%LOGDIR/name%TESTNUMBER
+</notexists>
 </verify>
 </testcase>

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

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

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

diff --git a/tests/data/test1443 b/tests/data/test1443
index aaeb448e1cd7aea7493519f01b6fe737c3ddd2ee..f3919d1d8887a817c2de97672842a07badd284d1 100644 (file)
--- a/tests/data/test1443
+++ b/tests/data/test1443
@@ -44,9 +44,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time
 </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/%TESTNUMBER"))[9] != 960898200)'
-</postcheck>
 </client>
 
 #
@@ -62,5 +59,8 @@ Accept: */*
 <file name="%LOGDIR/%TESTNUMBER">
 12345
 </file>
+<postcheck>
+perl -e 'exit((stat("%LOGDIR/%TESTNUMBER"))[9] != 960898200)'
+</postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test1444 b/tests/data/test1444
index f50c734f0c79ef7b2c6610a54dea04879f61cf96..7d80fa9263da610f7cbe8c13618fa1e9ecb887af 100644 (file)
--- a/tests/data/test1444
+++ b/tests/data/test1444
@@ -28,11 +28,6 @@ FTP with --remote-time
 <command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time
 </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>
 
 # Verify data after the test has been "shot"
@@ -51,5 +46,10 @@ SIZE %TESTNUMBER
 RETR %TESTNUMBER\r
 QUIT\r
 </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>
 </testcase>

diff --git a/tests/data/test1445 b/tests/data/test1445
index fee8932f14b916ac64454d3c63f59a905d2d7292..abdf58852208d186f011a13fa2ac0f94d707ced8 100644 (file)
--- a/tests/data/test1445
+++ b/tests/data/test1445
@@ -23,13 +23,13 @@ file:// with --remote-time
 <command>
 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt --remote-time
 </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>
 
 # Verify data after the test has been "shot"
 <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>
 </testcase>

diff --git a/tests/data/test1446 b/tests/data/test1446
index c606ef427dc8dc03107f909043a20dbf41b72a9a..8cab8d5483d16a7a8f9187737b69053c4e383698 100644 (file)
--- a/tests/data/test1446
+++ b/tests/data/test1446
@@ -26,14 +26,14 @@ SFTP with --remote-time
 <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
 </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>
 
 #
 # Verify data after the test has been "shot"
 <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>
 </testcase>

diff --git a/tests/data/test1683 b/tests/data/test1683
index 581470dfc6ab720c6678798f73df60194d010ac8..cf55568d37a4405c28513becb4a194daf20190fe 100644 (file)
--- a/tests/data/test1683
+++ b/tests/data/test1683
@@ -41,9 +41,6 @@ to stay the same
 <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) }'
 </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>
 
 #
@@ -55,5 +52,8 @@ perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; op
 <file name="%LOGDIR/exist%TESTNUMBER">
 to stay the same
 </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>
 </testcase>

diff --git a/tests/data/test608 b/tests/data/test608
index e359dd46c790d251b32f774545bed5b608779406..233b3d0c2c5592c7098ff127b6224e2ce4df6a9f 100644 (file)
--- a/tests/data/test608
+++ b/tests/data/test608
@@ -28,9 +28,6 @@ SFTP post-quote rename
 </command>
 # 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.
-<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">
 Test file for rename test
 </file>
@@ -42,5 +39,8 @@ Test file for rename test
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 Test file for rename test
 </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>
 </testcase>

diff --git a/tests/data/test610 b/tests/data/test610
index 3133ad3facbe20f5ccfe746bfb34d720e22ab0e5..a41201a8b79b4159abf13e6e835db8040c51a039 100644 (file)
--- a/tests/data/test610
+++ b/tests/data/test610
@@ -29,9 +29,6 @@ SFTP post-quote rmdir
 <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
 </command>
-<postcheck>
-perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/%LOGDIR/test%TESTNUMBER.dir
-</postcheck>
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for rmdir test
 </file>
@@ -40,5 +37,8 @@ Dummy test file for rmdir test
 #
 # Verify data after the test has been "shot"
 <verify>
+<postcheck>
+perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/%LOGDIR/test%TESTNUMBER.dir
+</postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test611 b/tests/data/test611
index 34670c1ca61516c15127f891ad6d2c07fd3bdbb7..8c11bce76a23b7bd52c5de80bb8850888aa433ac 100644 (file)
--- a/tests/data/test611
+++ b/tests/data/test611
@@ -29,9 +29,6 @@ SFTP post-quote rename
 <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
 </command>
-<postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
-</postcheck>
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
@@ -40,5 +37,8 @@ Dummy test file for rename test
 #
 # Verify data after the test has been "shot"
 <verify>
+<postcheck>
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
+</postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test612 b/tests/data/test612
index 267026cb14432becbbb3b1d9a954b503bd2f8593..977f470301ec78e5140604d5606262a9c23558a4 100644 (file)
--- a/tests/data/test612
+++ b/tests/data/test612
@@ -26,9 +26,6 @@ SFTP post-quote remove file
 <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
 </command>
-<postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
-</postcheck>
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for remove test
 </file>
@@ -40,5 +37,8 @@ Dummy test file for remove test
 <upload>
 Dummy test file for remove test
 </upload>
+<postcheck>
+perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
+</postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test613 b/tests/data/test613
index c90adb09f1f3e70d6372b03153b14cd989d95df2..67724590464effe297f0371c924e7d3420a7907f 100644 (file)
--- a/tests/data/test613
+++ b/tests/data/test613
@@ -31,13 +31,13 @@ SFTP directory retrieval
 <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
 </command>
-<postcheck>
-perl %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
-</postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
+<postcheck>
+perl %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
+</postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test614 b/tests/data/test614
index 1f5214b6e05a6b65fb6f804d8386a5dac4806d12..a5df69f05195ec6686b1ae6f1b4693638f3a3a3b 100644 (file)
--- a/tests/data/test614
+++ b/tests/data/test614
@@ -32,13 +32,13 @@ SFTP pre-quote chmod
 <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
 </command>
-<postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
-</postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
+<postcheck>
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out
+</postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test615 b/tests/data/test615
index 37a2fccdff5cfe06082fdd502ae152f03513f836..766ac330cdcd9b68e3712c1a82d705f5455d8db5 100644 (file)
--- a/tests/data/test615
+++ b/tests/data/test615
@@ -22,9 +22,6 @@ SFTP put remote failure
 <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
 </command>
-<postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir
-</postcheck>
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
@@ -37,5 +34,8 @@ for ssh upload test
 <errorcode>
 9
 </errorcode>
+<postcheck>
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir
+</postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test624 b/tests/data/test624
index e126fd192fff83b424073474a12d0f887dbd3664..b20b2140807dcda9938bf959085abe76ba23807a 100644 (file)
--- a/tests/data/test624
+++ b/tests/data/test624
@@ -24,9 +24,6 @@ SFTP put with --ftp-create-dirs
 <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
 </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">
 Test data
 for ssh upload test
@@ -40,5 +37,8 @@ for ssh upload test
 Test data
 for ssh upload test
 </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>
 </testcase>

diff --git a/tests/data/test625 b/tests/data/test625
index d9b9ac824e10e6331d20de3f8bf2ef8642284f11..bf949329fdcd20529032a851ddea62ae037134f2 100644 (file)
--- a/tests/data/test625
+++ b/tests/data/test625
@@ -24,9 +24,6 @@ SFTP put with --ftp-create-dirs twice
 <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
 </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">
 Test data
 for ssh upload test
@@ -40,5 +37,8 @@ for ssh upload test
 Test data
 for ssh upload test
 </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>
 </testcase>

diff --git a/tests/data/test627 b/tests/data/test627
index 6ce173d63fb38fecf2dad2365eb069b1bae9bdc7..764ac8515fbdee8cda320f7c1082b3bdb471efbd 100644 (file)
--- a/tests/data/test627
+++ b/tests/data/test627
@@ -26,9 +26,6 @@ SFTP quote remove file with NOBODY
 <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
 </command>
-<postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
-</postcheck>
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for remove test
 </file>
@@ -39,5 +36,8 @@ Dummy test file for remove test
 <verify>
 <protocol>
 </protocol>
+<postcheck>
+perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
+</postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test638 b/tests/data/test638
index a57d32168a6de10a97e22cef1337fedd1f2dda79..a1c77927af36bc85acc50ff99f4804c94cebe7f7 100644 (file)
--- a/tests/data/test638
+++ b/tests/data/test638
@@ -31,9 +31,6 @@ SFTP post-quote rename * asterisk accept-fail
 <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
 </command>
-<postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
-</postcheck>
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
@@ -42,5 +39,8 @@ Dummy test file for rename test
 #
 # Verify data after the test has been "shot"
 <verify>
+<postcheck>
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
+</postcheck>
 </verify>
 </testcase>

diff --git a/tests/data/test639 b/tests/data/test639
index a93cc3f95e1370645025dc590f94fdb48979e2c6..46aed8df4b9f631431457c3fb0628e2d73c2344e 100644 (file)
--- a/tests/data/test639
+++ b/tests/data/test639
@@ -31,9 +31,6 @@ SFTP post-quote rename * asterisk accept-fail
 <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
 </command>
-<postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
-</postcheck>
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
@@ -42,5 +39,8 @@ Dummy test file for rename test
 #
 # Verify data after the test has been "shot"
 <verify>
+<postcheck>
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
+</postcheck>
 </verify>
 </testcase>

diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 6358ec1bea7a8f873b3786a37754f687d7d3a976..f9c44f0dd960ab5e996810c35b61299f6f78f3e9 100644 (file)
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -38,7 +38,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_srcdir)/tests/libtest
 
 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@
 

diff --git a/tests/libtest/notexists.pl b/tests/libtest/notexists.pl
deleted file mode 100755 (executable)
index 2bc9bb5..0000000
--- a/tests/libtest/notexists.pl
+++ /dev/null
@@ -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;

diff --git a/tests/runner.pm b/tests/runner.pm
index 5b83a1a6606d171ed765fda43501d4a4b040f6f0..566fd5f5160f6b370d13634cccce59655566d3c9 100644 (file)
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -1130,6 +1130,11 @@ sub singletest_postcheck {
 
     # run the postcheck command
     my @postcheck= getpart("client", "postcheck");
+    if(@postcheck) {
+        die "test$testnum uses client/postcheck";
+    }
+
+    @postcheck= getpart("verify", "postcheck");
     if(@postcheck) {
         my $cmd = join("", @postcheck);
         chomp $cmd;

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 31485585e63fce80d1ac3919b3da5415a6424cfd..d906a2757e74d42e60ec695f651fb62836ead078 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -1714,6 +1714,25 @@ sub singletest_check {
         $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($usedvalgrind) {
             if(!opendir(DIR, "$logdir")) {