1 files changed, 18 insertions, 18 deletions
diff --git a/tests/data/test2007 b/tests/data/test2007
index 4c456151a..679de26e1 100644
--- a/tests/data/test2007
+++ b/tests/data/test2007
@@ -19,7 +19,7 @@ Server: test-server/fake
 Content-Length: 42
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2007; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Something delivered from an HTTP resource
@@ -47,27 +47,27 @@ Metalink local XML file, HTTP resource, using -O -J -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2007.metalink -J -O -D log/heads2007
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -J -O -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2007.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/download2007">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">52899e30f80e3490632d505653204e1fb5b02bda141048704ce9a0ed00b8a3f5</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2007</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2007 log/name2007
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -75,13 +75,13 @@ perl %SRCDIR/libtest/notexists.pl log/2007 log/name2007
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2007 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file1 name="log/download2007">
+<file1 name="log/download%TESTNUMBER">
 Something delivered from an HTTP resource
 </file1>
 # The Content-Length replace here is to handle with 4/5 digit port number in
@@ -90,7 +90,7 @@ Something delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2007">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps
 Accept-ranges: bytes
 
@@ -101,19 +101,19 @@ Server: test-server/fake
 Content-Length: 42
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2007; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2007">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2007" mode="text">
-Metalink: parsing (file://%PWD/log/test2007.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2007.metalink) OK
-Metalink: fetching (log/download2007) from (http://%HOSTIP:%HTTPPORT/2007)...
-Metalink: fetching (log/download2007) from (http://%HOSTIP:%HTTPPORT/2007) OK
-Metalink: validating (log/download2007)...
-Metalink: validating (log/download2007) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+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) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))