tests: use %TESTNUMBER instead of fixed number

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

View file

@ -17,7 +17,7 @@ Server: test-server/fake
Content-Length: 56
Connection: close
Content-Type: text/html
Content-Disposition: filename=name2016; charset=funny; option=strange
Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
Funny-head: yesyes
Data that should not be delivered from an HTTP resource
@ -38,38 +38,38 @@ Metalink
Metalink local XML file, attempt Unix path traversal
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2016.metalink
--metalink file://%PWD/log/test%TESTNUMBER.metalink
</command>
# local metalink file written before test command runs
<file name="log/test2016.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/../log/download2016">
<file name="log/../log/download%TESTNUMBER">
<verification>
<hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
</verification>
<resources maxconnections="1">
<url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2016</url>
<url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
</resources>
</file>
</files>
</metalink>
</file>
<postcheck>
perl %SRCDIR/libtest/notexists.pl log/2016 log/name2016 log/download2016
perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
</postcheck>
</client>
#
# Verify data after the test has been "shot"
<verify>
<file1 name="log/stdout2016">
<file1 name="log/stdout%TESTNUMBER">
</file1>
<file2 name="log/stderr2016" mode="text">
Metalink: parsing (file://%PWD/log/test2016.metalink) metalink/XML...
Metalink: parsing (file://%PWD/log/test2016.metalink) WARNING (missing or invalid file name)
Metalink: parsing (file://%PWD/log/test2016.metalink) FAILED
<file2 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 (missing or invalid file name)
Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
</file2>
<stripfile2>
$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))