moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

tests: fix test definitions # 1370 and 1371 

-J without -O shall not honor C-D filename
This commit is contained in:
Yang Tse 2012-06-09 05:31:57 +02:00
parent 674e53f40e
commit c29d1f4e3a
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/data/test1370
View File

@ -25,25 +25,17 @@ Content-Disposition: filename=name1370; charset=funny; option=strange
# #
# Client-side # Client-side
<client> <client>
# this relies on the debug feature to allow us to set directory to store the
# -J output in, using the CURL_TESTDIR variable
<features>
debug
</features>
<server> <server>
http http
</server> </server>
<name> <name>
HTTP GET -o fname -J and Content-Disposition, -D file HTTP GET -o fname -J and Content-Disposition, -D file
</name> </name>
<setenv>
CURL_TESTDIR=%PWD/log
</setenv>
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/1370 -J -o log/outfile1370 -D log/heads1370 http://%HOSTIP:%HTTPPORT/1370 -J -o log/outfile1370 -D log/heads1370
</command> </command>
<postcheck> <postcheck>
perl %SRCDIR/libtest/notexists.pl log/1370 perl %SRCDIR/libtest/notexists.pl log/1370 log/name1370
</postcheck> </postcheck>
</client> </client>
@ -60,7 +52,7 @@ Accept: */*
</protocol> </protocol>
<file1 name="log/name1370"> <file1 name="log/outfile1370">
12345 12345
</file1> </file1>
@ -76,7 +68,6 @@ Content-Disposition: filename=name1370; charset=funny; option=strange
</file2> </file2>
<file3 name="log/stdout1370"> <file3 name="log/stdout1370">
curl: Saved to filename '%PWD/log/name1370'
</file3> </file3>
</verify> </verify>

13
tests/data/test1371
View File

@ -25,25 +25,17 @@ Content-Disposition: filename=name1371; charset=funny; option=strange
# #
# Client-side # Client-side
<client> <client>
# this relies on the debug feature to allow us to set directory to store the
# -J output in, using the CURL_TESTDIR variable
<features>
debug
</features>
<server> <server>
http http
</server> </server>
<name> <name>
HTTP GET -o fname -J and Content-Disposition, -D stdout HTTP GET -o fname -J and Content-Disposition, -D stdout
</name> </name>
<setenv>
CURL_TESTDIR=%PWD/log
</setenv>
<command option="no-output,no-include"> <command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/1371 -J -o log/outfile1371 -D - http://%HOSTIP:%HTTPPORT/1371 -J -o log/outfile1371 -D -
</command> </command>
<postcheck> <postcheck>
perl %SRCDIR/libtest/notexists.pl log/1371 perl %SRCDIR/libtest/notexists.pl log/1371 log/name1371
</postcheck> </postcheck>
</client> </client>
@ -60,7 +52,7 @@ Accept: */*
</protocol> </protocol>
<file1 name="log/name1371"> <file1 name="log/outfile1371">
12345 12345
</file1> </file1>
@ -73,7 +65,6 @@ Connection: close
Content-Type: text/html Content-Type: text/html
Content-Disposition: filename=name1371; charset=funny; option=strange Content-Disposition: filename=name1371; charset=funny; option=strange
curl: Saved to filename '%PWD/log/name1371'
</file2> </file2>
</verify> </verify>