romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 14:53:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests: use %TESTNUMBER instead of fixed number

Browse source 
This makes the tests easier to copy and relocate to other test numbers
without having to update content.

Closes #6738
This commit is contained in:
Daniel Stenberg 2021-03-12 17:38:26 +01:00
parent 453ad35d15
commit e2b4df7b5e
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1292 changed files with 4386 additions and 4389 deletions
Download patch file Download diff file Expand all files Collapse all files

34
tests/data/test2012
View file

@ -12,12 +12,12 @@ HTTP GET
<reply>
<data nocheck="yes">
HTTP/1.1 200 OK
Date: Wed, 20 Jun 2012 14:49:00 GMT
Date: Wed, 20 Jun %TESTNUMBER 14:49:00 GMT
Server: test-server/fake
Content-Length: 46
Connection: close
Content-Type: text/html
Content-Disposition: filename=name2012; charset=funny; option=strange
Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
Funny-head: yesyes
Some contents delivered from an HTTP resource
@ -38,25 +38,25 @@ Metalink
Metalink local XML file, HTTP resource, without hash
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2012.metalink
--metalink file://%PWD/log/test%TESTNUMBER.metalink
</command>
# local metalink file written before test command runs
<file name="log/test2012.metalink">
<file name="log/test%TESTNUMBER.metalink">
<?xml version="1.0" encoding="utf-8"?>
<metalink version="3.0" xmlns="http://www.metalinker.org/">
<files>
<file name="log/download2012">
<file name="log/download%TESTNUMBER">
<verification>
</verification>
<resources maxconnections="1">
<url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2012</url>
<url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
</resources>
</file>
</files>
</metalink>
</file>
<postcheck>
perl %SRCDIR/libtest/notexists.pl log/2012 log/name2012
perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
</postcheck>
</client>
@ -64,24 +64,24 @@ perl %SRCDIR/libtest/notexists.pl log/2012 log/name2012
# Verify data after the test has been "shot"
<verify>
<protocol>
GET /2012 HTTP/1.1
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
</protocol>
<file1 name="log/download2012">
<file1 name="log/download%TESTNUMBER">
Some contents delivered from an HTTP resource
</file1>
<file2 name="log/stdout2012">
<file2 name="log/stdout%TESTNUMBER">
</file2>
<file3 name="log/stderr2012" mode="text">
Metalink: parsing (file://%PWD/log/test2012.metalink) metalink/XML...
Metalink: parsing (file://%PWD/log/test2012.metalink) WARNING (digest missing)
Metalink: fetching (log/download2012) from (http://%HOSTIP:%HTTPPORT/2012)...
Metalink: fetching (log/download2012) from (http://%HOSTIP:%HTTPPORT/2012) OK
Metalink: validating (log/download2012)...
Metalink: validating (log/download2012) FAILED (digest missing)
<file3 name="log/stderr%TESTNUMBER" mode="text">
Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (digest missing)
Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
Metalink: validating (log/download%TESTNUMBER)...
Metalink: validating (log/download%TESTNUMBER) FAILED (digest missing)
</file3>
<stripfile3>
$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))