tests 1348 to 1363: test definition polishing

Verify that the "Saved to filename 'blabla'" message is only displayed when
the 'blabla' filename being used _actually_ has been specified by the server
in the Content-Disposition header.

Use relative path for unintended file creation postcheck.

diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 978ddddccc1a6b84cabfc153080fd9c403899f89..d18bc7b278e42d7284ed4c8f5ef3bb08e6df6ca8 100644 (file)
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -22,3 +22,6 @@
 1361
 1362
 #
+1338
+1339
+#

diff --git a/tests/data/test1336 b/tests/data/test1336
index 61721c61a6ccf4613b04d8ce2e5b03d1a9b54fe1..cce9fae89c815d5d3a0cba5162be409b445f178f 100644 (file)
--- a/tests/data/test1336
+++ b/tests/data/test1336
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 http://%HOSTIP:%HTTPPORT/1336 -O -D log/heads1336
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1336
+perl %SRCDIR/libtest/notexists.pl log/name1336
 </postcheck>
 </client>
 

diff --git a/tests/data/test1337 b/tests/data/test1337
index e072da07b6a2a66c362d7fa8a728b926439a8a21..317cd88adb42db1afe538d85bbc31109120432e5 100644 (file)
--- a/tests/data/test1337
+++ b/tests/data/test1337
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 http://%HOSTIP:%HTTPPORT/1337 -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1337
+perl %SRCDIR/libtest/notexists.pl log/name1337
 </postcheck>
 </client>
 

diff --git a/tests/data/test1338 b/tests/data/test1338
index c6b4c56cdc8879fd4aad0b8c977a97697c5de91e..3c1507180127856de1cdbac77feef25afa5c00ba 100644 (file)
--- a/tests/data/test1338
+++ b/tests/data/test1338
@@ -71,7 +71,6 @@ Content-Type: text/html
 </file2>
 
 <file3 name="log/stdout1338">
-curl: Saved to filename '%PWD/log/1338'
 </file3>
 
 </verify>

diff --git a/tests/data/test1339 b/tests/data/test1339
index 7137700180b64e03c2b8a68f4c38a87700c6f718..d5e236a50f9efc18ae653275a2b72f9fef5c1c3b 100644 (file)
--- a/tests/data/test1339
+++ b/tests/data/test1339
@@ -68,7 +68,6 @@ Content-Length: 6
 Connection: close
 Content-Type: text/html
 
-curl: Saved to filename '%PWD/log/1339'
 </file2>
 
 </verify>

diff --git a/tests/data/test1344 b/tests/data/test1344
index fbc6dad1f89641c485d60d9bbbd60d1a9627254b..b71b2c49de811bf9faa0cee9118b546010865619 100644 (file)
--- a/tests/data/test1344
+++ b/tests/data/test1344
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 http://%HOSTIP:%HTTPPORT/1344 -i -O -D log/heads1344
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1344
+perl %SRCDIR/libtest/notexists.pl log/name1344
 </postcheck>
 </client>
 

diff --git a/tests/data/test1345 b/tests/data/test1345
index 24bd577d6cddad78baf44f66cf3fac6719cd7771..f5e16127c6d47a70600f7cdfefb90b7fd77d93fa 100644 (file)
--- a/tests/data/test1345
+++ b/tests/data/test1345
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 http://%HOSTIP:%HTTPPORT/1345 -i -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1345
+perl %SRCDIR/libtest/notexists.pl log/name1345
 </postcheck>
 </client>
 

diff --git a/tests/data/test1347 b/tests/data/test1347
index 33fa0e6da36963b8fec7d5f78cb79b5c13ab7c91..e4a60bf100997d52a1de08885305e7ce35f96542 100644 (file)
--- a/tests/data/test1347
+++ b/tests/data/test1347
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 http://%HOSTIP:%HTTPPORT/1347 -i -O
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1347
+perl %SRCDIR/libtest/notexists.pl log/name1347
 </postcheck>
 </client>
 

diff --git a/tests/data/test1351 b/tests/data/test1351
index cc5c4e7cfd4b6c136633d55b3d174d2751e083ed..fea442fc7fc231bde164c84b98f75b70814da9df 100644 (file)
--- a/tests/data/test1351
+++ b/tests/data/test1351
@@ -77,7 +77,6 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
 <file3 name="log/stdout1351">
-curl: Saved to filename '%PWD/log/file1351'
 </file3>
 
 </verify>

diff --git a/tests/data/test1352 b/tests/data/test1352
index 65ae300ec5cbd74e486aa9f7deae5a6b879e82b4..ca24d4911b270e1f5532ccec988756b6ac428c76 100644 (file)
--- a/tests/data/test1352
+++ b/tests/data/test1352
@@ -71,7 +71,6 @@ mooo
 150 Binary data connection for 1352 () (10 bytes).\r
 226 File transfer complete\r
 221 bye bye baby\r
-curl: Saved to filename '%PWD/log/file1352'
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/

diff --git a/tests/data/test1356 b/tests/data/test1356
index 55cbbea8135af999409b135b48e1bed45376d0ef..b1974bbbc78940f9462b749540677bc6cb91df63 100644 (file)
--- a/tests/data/test1356
+++ b/tests/data/test1356
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 ftp://%HOSTIP:%FTPPORT/path/file1356 -O
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1356
+perl %SRCDIR/libtest/notexists.pl log/name1356
 </postcheck>
 </client>
 

diff --git a/tests/data/test1357 b/tests/data/test1357
index d98ee20f85424f24b8ddb126509fd56653713f01..4b539ec6d046b2b2e76027cadaf8d46076c8bf71 100644 (file)
--- a/tests/data/test1357
+++ b/tests/data/test1357
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 ftp://%HOSTIP:%FTPPORT/path/file1357 -O -D log/heads1357
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1357
+perl %SRCDIR/libtest/notexists.pl log/name1357
 </postcheck>
 </client>
 

diff --git a/tests/data/test1358 b/tests/data/test1358
index fd79d521942bd5b8303f9d82b62ba3b4e4ac17e0..081b36f1d6d7d80a083a7096ed3c6ee384d0c1b8 100644 (file)
--- a/tests/data/test1358
+++ b/tests/data/test1358
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 ftp://%HOSTIP:%FTPPORT/path/file1358 -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1358
+perl %SRCDIR/libtest/notexists.pl log/name1358
 </postcheck>
 </client>
 

diff --git a/tests/data/test1359 b/tests/data/test1359
index e7597cb900573685b87139b83ca54c3e2d9ac757..bb9747ae489e8235e08b53a77ffb379f9ab01235 100644 (file)
--- a/tests/data/test1359
+++ b/tests/data/test1359
@@ -43,7 +43,7 @@ CURL_TESTDIR=%PWD/log
 ftp://%HOSTIP:%FTPPORT/path/file1359 -O -J -D log/heads1359
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1359
+perl %SRCDIR/libtest/notexists.pl log/name1359
 </postcheck>
 </client>
 
@@ -95,7 +95,6 @@ s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
 <file3 name="log/stdout1359">
-curl: Saved to filename '%PWD/log/file1359'
 </file3>
 
 </verify>

diff --git a/tests/data/test1360 b/tests/data/test1360
index 9308e870180660245098a945b1c931879e6cadf0..d2cb33dfcb7d54cd3abcf386c0958f8b0af73cd7 100644 (file)
--- a/tests/data/test1360
+++ b/tests/data/test1360
@@ -43,7 +43,7 @@ CURL_TESTDIR=%PWD/log
 ftp://%HOSTIP:%FTPPORT/path/file1360 -O -J -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1360
+perl %SRCDIR/libtest/notexists.pl log/name1360
 </postcheck>
 </client>
 
@@ -89,7 +89,6 @@ MOOOO
 150 Binary data connection for 1360 () (214 bytes).\r
 226 File transfer complete\r
 221 bye bye baby\r
-curl: Saved to filename '%PWD/log/file1360'
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/

diff --git a/tests/data/test1361 b/tests/data/test1361
index 27b3b4140b8b8eb68f97496bd2d3c2fbc559546a..8d3f1f53bbf2f1b61bb8ac7767b6f53cbd6e69bc 100644 (file)
--- a/tests/data/test1361
+++ b/tests/data/test1361
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 ftp://%HOSTIP:%FTPPORT/path/file1361 -O -i -D log/heads1361
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1361
+perl %SRCDIR/libtest/notexists.pl log/name1361
 </postcheck>
 </client>
 

diff --git a/tests/data/test1362 b/tests/data/test1362
index 04435047fb4c5341010a7c6588ace460a10ce6c1..5dc41811c4b1b7a7dd6959952a7bad515976a71a 100644 (file)
--- a/tests/data/test1362
+++ b/tests/data/test1362
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 ftp://%HOSTIP:%FTPPORT/path/file1362 -O -i -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1362
+perl %SRCDIR/libtest/notexists.pl log/name1362
 </postcheck>
 </client>
 

diff --git a/tests/data/test1363 b/tests/data/test1363
index f1a2b704a92d1a5b065e4de5cfb92026c5a31e21..144e1b3484c9c4ca0e0e4b39c7e1c4d0632c2d76 100644 (file)
--- a/tests/data/test1363
+++ b/tests/data/test1363
@@ -42,7 +42,7 @@ CURL_TESTDIR=%PWD/log
 ftp://%HOSTIP:%FTPPORT/path/file1363 -O -i
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl %PWD/log/name1363
+perl %SRCDIR/libtest/notexists.pl log/name1363
 </postcheck>
 </client>