From 430791616b6c067b6da3ab64e486d6ca8d8136f4 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Thu, 7 Jun 2012 15:26:03 +0200
Subject: [PATCH] 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.
---
tests/data/DISABLED | 3 +++
tests/data/test1336 | 2 +-
tests/data/test1337 | 2 +-
tests/data/test1338 | 1 -
tests/data/test1339 | 1 -
tests/data/test1344 | 2 +-
tests/data/test1345 | 2 +-
tests/data/test1347 | 2 +-
tests/data/test1351 | 1 -
tests/data/test1352 | 1 -
tests/data/test1356 | 2 +-
tests/data/test1357 | 2 +-
tests/data/test1358 | 2 +-
tests/data/test1359 | 3 +--
tests/data/test1360 | 3 +--
tests/data/test1361 | 2 +-
tests/data/test1362 | 2 +-
tests/data/test1363 | 2 +-
18 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 978ddddccc..d18bc7b278 100644
--- 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 61721c61a6..cce9fae89c 100644
--- 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 e072da07b6..317cd88adb 100644
--- 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 c6b4c56cdc..3c15071801 100644
--- 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 7137700180..d5e236a50f 100644
--- 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 fbc6dad1f8..b71b2c49de 100644
--- 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 24bd577d6c..f5e16127c6 100644
--- 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 33fa0e6da3..e4a60bf100 100644
--- 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 cc5c4e7cfd..fea442fc7f 100644
--- 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 65ae300ec5..ca24d4911b 100644
--- a/tests/data/test1352
+++ b/tests/data/test1352
@@ -71,7 +71,6 @@ mooo
150 Binary data connection for 1352 () (10 bytes).
226 File transfer complete
221 bye bye baby
-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 55cbbea813..b1974bbbc7 100644
--- 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 d98ee20f85..4b539ec6d0 100644
--- 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 fd79d52194..081b36f1d6 100644
--- 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 e7597cb900..bb9747ae48 100644
--- 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 9308e87018..d2cb33dfcb 100644
--- 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).
226 File transfer complete
221 bye bye baby
-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 27b3b4140b..8d3f1f53bb 100644
--- 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 04435047fb..5dc41811c4 100644
--- 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 f1a2b704a9..144e1b3484 100644
--- 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>
--
GitLab