summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2012-06-07 15:26:03 +0200
committerYang Tse <yangsita@gmail.com>2012-06-07 15:29:46 +0200
commit430791616b6c067b6da3ab64e486d6ca8d8136f4 (patch)
treef7c942215c47b810d6cd4bc176df6ecd35d77212
parent00fddba6727c44bbf5f22b2bfaff4ef1d7111b19 (diff)
downloadgnurl-430791616b6c067b6da3ab64e486d6ca8d8136f4.tar.gz
gnurl-430791616b6c067b6da3ab64e486d6ca8d8136f4.tar.bz2
gnurl-430791616b6c067b6da3ab64e486d6ca8d8136f4.zip
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.
-rw-r--r--tests/data/DISABLED3
-rw-r--r--tests/data/test13362
-rw-r--r--tests/data/test13372
-rw-r--r--tests/data/test13381
-rw-r--r--tests/data/test13391
-rw-r--r--tests/data/test13442
-rw-r--r--tests/data/test13452
-rw-r--r--tests/data/test13472
-rw-r--r--tests/data/test13511
-rw-r--r--tests/data/test13521
-rw-r--r--tests/data/test13562
-rw-r--r--tests/data/test13572
-rw-r--r--tests/data/test13582
-rw-r--r--tests/data/test13593
-rw-r--r--tests/data/test13603
-rw-r--r--tests/data/test13612
-rw-r--r--tests/data/test13622
-rw-r--r--tests/data/test13632
18 files changed, 16 insertions, 19 deletions
diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 978ddddcc..d18bc7b27 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 61721c61a..cce9fae89 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 e072da07b..317cd88ad 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 c6b4c56cd..3c1507180 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 713770018..d5e236a50 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 fbc6dad1f..b71b2c49d 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 24bd577d6..f5e16127c 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 33fa0e6da..e4a60bf10 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 cc5c4e7cf..fea442fc7 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 65ae300ec..ca24d4911 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 55cbbea81..b1974bbbc 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 d98ee20f8..4b539ec6d 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 fd79d5219..081b36f1d 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 e7597cb90..bb9747ae4 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 9308e8701..d2cb33dfc 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 27b3b4140..8d3f1f53b 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 04435047f..5dc41811c 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 f1a2b704a..144e1b348 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>