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
2024-11-11 20:15:03 -05:00 · 2021-03-12 17:38:26 +01:00 · 2021-03-12 17:38:26 +01:00 · e2b4df7b5e
commit e2b4df7b5e
parent 453ad35d15
1292 changed files with 4386 additions and 4389 deletions
--- a/tests/data/test1
+++ b/tests/data/test1
@ -35,7 +35,7 @@ http
 HTTP GET
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/1
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test10
+++ b/tests/data/test10
@ -26,9 +26,9 @@ http
 simple HTTP PUT from file
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/10 -T log/test10.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test10.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
     file
         to
@ -44,7 +44,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /we/want/10 HTTP/1.1
+PUT /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test100
+++ b/tests/data/test100
@ -36,7 +36,7 @@ ftp
 FTP dir list PASV
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/test-100/
+ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 </command>
 </client>
@ -47,7 +47,7 @@ ftp://%HOSTIP:%FTPPORT/test-100/
 USER anonymous
 PASS ftp@example.com
 PWD
-CWD test-100
+CWD test-%TESTNUMBER
 EPSV
 TYPE A
 LIST
--- a/tests/data/test1000
+++ b/tests/data/test1000
@ -24,7 +24,7 @@ ftp
 FTP dir list PASV with -I
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/1000/ -I
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I
 </command>
 </client>
@ -35,7 +35,7 @@ ftp://%HOSTIP:%FTPPORT/1000/ -I
 USER anonymous
 PASS ftp@example.com
 PWD
-CWD 1000
+CWD %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1001
+++ b/tests/data/test1001
@ -72,9 +72,9 @@ proxy
 HTTP POST --digest with PUT and resumed upload and modified method
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1001 -u auser:apasswd --digest -T log/1001 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/1001">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@ -82,7 +82,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
@ -90,9 +90,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
-GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1001", response="6af4d89c952f4dd4cc215a6878dc499d"
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="6af4d89c952f4dd4cc215a6878dc499d"
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1002
+++ b/tests/data/test1002
@ -71,9 +71,9 @@ proxy
 HTTP PUT with Digest auth, resumed upload and modified method, twice
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1002.upload1 -T log/1002 http://%HOSTIP:%HTTPPORT/1002.upload2 -T log/1002 -u auser:apasswd --digest -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 -T log/%TESTNUMBER -u auser:apasswd --digest -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/1002">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@ -81,7 +81,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
@ -89,9 +89,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
-GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
 Accept: */*
@ -100,7 +100,7 @@ Content-Length: 3
 Expect: 100-continue
 st
-GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
@ -108,9 +108,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
-GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload2", response="d711f0d2042786d930de635ba0d1a1d0"
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER.upload2", response="d711f0d2042786d930de635ba0d1a1d0"
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1003
+++ b/tests/data/test1003
@ -27,7 +27,7 @@ ftp
 FTP with excessively large server command response line
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/path/1003
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
@ -40,8 +40,8 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 1003
+SIZE %TESTNUMBER
-RETR 1003
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1004
+++ b/tests/data/test1004
@ -36,7 +36,7 @@ http
 HTTP GET with empty proxy
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1004 --proxy ""
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy ""
 </command>
 </client>
@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/1004 --proxy ""
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1004 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1005
+++ b/tests/data/test1005
@ -27,7 +27,7 @@ ftp
 FTP with excessively large number of server command response lines
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/path/1005
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
@ -40,8 +40,8 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 1005
+SIZE %TESTNUMBER
-RETR 1005
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1006
+++ b/tests/data/test1006
@ -28,7 +28,7 @@ ftp
 FTP with excessively large number of server command response lines (boundary condition)
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/path/1006
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
@ -41,8 +41,8 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 1006
+SIZE %TESTNUMBER
-RETR 1006
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1007
+++ b/tests/data/test1007
@ -17,9 +17,9 @@ tftp
 TFTP send with invalid permission on server
 </name>
 <command>
-T log/test1007.txt tftp://%HOSTIP:%TFTPPORT//invalid-file
+-T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//invalid-file
 </command>
-<file name="log/test1007.txt">
+<file name="log/test%TESTNUMBER.txt">
 This data will not be sent
 </file>
 </client>
--- a/tests/data/test1008
+++ b/tests/data/test1008
@ -101,7 +101,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
 </setenv>
 <command>
-http://test.remote.example.com.1008:%HTTPPORT/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@ -111,20 +111,20 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.1008:%HTTPPORT
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
-CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.1008:%HTTPPORT
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
-GET /path/10080002 HTTP/1.1
+GET /path/%TESTNUMBER0002 HTTP/1.1
-Host: test.remote.example.com.1008:%HTTPPORT
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1009
+++ b/tests/data/test1009
@ -28,7 +28,7 @@ tftp
 TFTP retrieve with --local-port
 </name>
 <command>
-tftp://%HOSTIP:%TFTPPORT//1009 --local-port 44444-45444
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --local-port 44444-45444
 </command>
 </client>
@ -41,7 +41,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1009
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
--- a/tests/data/test1010
+++ b/tests/data/test1010
@ -36,7 +36,7 @@ ftp
 FTP dir list nocwd
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT//list/this/path/1010/ ftp://%HOSTIP:%FTPPORT//list/this/path/1010/ --ftp-method nocwd
+ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ --ftp-method nocwd
 </command>
 </client>
@ -49,9 +49,9 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE A
-LIST /list/this/path/1010
+LIST /list/this/path/%TESTNUMBER
 EPSV
-LIST /list/this/path/1010
+LIST /list/this/path/%TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1011
+++ b/tests/data/test1011
@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK
-Location: moo.html&testcase=/10110002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 0
@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 301 OK
-Location: moo.html&testcase=/10110002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 0
@ -49,7 +49,7 @@ http
 HTTP POST with 301 redirect
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/blah/1011 -L -d "moo"
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo"
 </command>
 </client>
@ -57,14 +57,14 @@ http://%HOSTIP:%HTTPPORT/blah/1011 -L -d "moo"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /blah/1011 HTTP/1.1
+POST /blah/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
-mooGET /blah/moo.html&testcase=/10110002 HTTP/1.1
+mooGET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1012
+++ b/tests/data/test1012
@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK swsclose
-Location: moo.html&testcase=/10120002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 301 OK swsclose
-Location: moo.html&testcase=/10120002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
@ -49,7 +49,7 @@ http
 HTTP POST with 301 redirect and --post301
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/blah/1012 -L -d "moo" --post301
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post301
 </command>
 </client>
@ -57,14 +57,14 @@ http://%HOSTIP:%HTTPPORT/blah/1012 -L -d "moo" --post301
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1012 HTTP/1.1
+POST /blah/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
-mooPOST /blah/moo.html&testcase=/10120002 HTTP/1.1
+mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1013
+++ b/tests/data/test1013
@ -23,7 +23,7 @@ Compare curl --version with curl-config --protocols
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1013 protocols
+%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config log/stdout%TESTNUMBER protocols
 </postcheck>
 </client>
--- a/tests/data/test1014
+++ b/tests/data/test1014
@ -23,7 +23,7 @@ Compare curl --version with curl-config --features
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1014 features
+%SRCDIR/libtest/test1013.pl ../curl-config log/stdout%TESTNUMBER features
 </postcheck>
 </client>
--- a/tests/data/test1015
+++ b/tests/data/test1015
@ -28,9 +28,9 @@ http
 --data-urlencode
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1015 --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@log/1015.txt" --data-urlencode @log/1015.txt 
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@log/%TESTNUMBER.txt" --data-urlencode @log/%TESTNUMBER.txt 
 </command>
-<file name="log/1015.txt">
+<file name="log/%TESTNUMBER.txt">
 content to _?!#$'|<>
 </file>
 </client>
@ -39,7 +39,7 @@ content to _?!#$'|<>
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /1015 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1016
+++ b/tests/data/test1016
@ -23,9 +23,9 @@ file
 X-Y range on a file:// URL to stdout
 </name>
 <command option="no-include">
-r 1-4 file://localhost%FILE_PWD/log/test1016.txt 
+-r 1-4 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1016.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>
--- a/tests/data/test1017
+++ b/tests/data/test1017
@ -24,9 +24,9 @@ file
 0-Y range on a file:// URL to stdout
 </name>
 <command option="no-include">
-r 0-3 file://localhost%FILE_PWD/log/test1017.txt 
+-r 0-3 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1017.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>
--- a/tests/data/test1018
+++ b/tests/data/test1018
@ -23,9 +23,9 @@ file
 X-X range on a file:// URL to stdout
 </name>
 <command option="no-include">
-r 4-4 file://localhost%FILE_PWD/log/test1018.txt 
+-r 4-4 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1018.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>
--- a/tests/data/test1019
+++ b/tests/data/test1019
@ -24,9 +24,9 @@ file
 X- range on a file:// URL to stdout
 </name>
 <command option="no-include">
-r 7- file://localhost%FILE_PWD/log/test1019.txt 
+-r 7- file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1019.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>
--- a/tests/data/test102
+++ b/tests/data/test102
@ -30,7 +30,7 @@ ftp
 FTP RETR PASV
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/102
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
@ -44,8 +44,8 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 102
+SIZE %TESTNUMBER
-RETR 102
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1020
+++ b/tests/data/test1020
@ -24,9 +24,9 @@ file
 -Y range on a file:// URL to stdout
 </name>
 <command option="no-include">
-r -9 file://localhost%FILE_PWD/log/test1020.txt 
+-r -9 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1020.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>
--- a/tests/data/test1021
+++ b/tests/data/test1021
@ -106,7 +106,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
 </setenv>
 <command>
-http://test.remote.example.com.1021:%HTTPPORT/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-anyauth --proxytunnel
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-anyauth --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@ -116,25 +116,25 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.1021:%HTTPPORT
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
-CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.1021:%HTTPPORT
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
-CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.1021:%HTTPPORT
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
-GET /path/10210002 HTTP/1.1
+GET /path/%TESTNUMBER0002 HTTP/1.1
-Host: test.remote.example.com.1021:%HTTPPORT
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1022
+++ b/tests/data/test1022
@ -23,7 +23,7 @@ Compare curl --version with curl-config --version
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1022 version
+%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config log/stdout%TESTNUMBER version
 </postcheck>
 </client>
--- a/tests/data/test1023
+++ b/tests/data/test1023
@ -23,7 +23,7 @@ Compare curl --version with curl-config --vernum
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1023 vernum
+%SRCDIR/libtest/test1022.pl ../curl-config log/stdout%TESTNUMBER vernum
 </postcheck>
 </client>
--- a/tests/data/test1024
+++ b/tests/data/test1024
@ -14,7 +14,7 @@ cookies
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../data/10240002.txt
+Location: ../data/%TESTNUMBER0002.txt
 Set-Cookie: firstcookie=want; path=/want/
 Content-Length: 69
@ -25,7 +25,7 @@ This server reply is for testing a Location: following with cookies
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../want/10240003.txt
+Location: ../want/%TESTNUMBER0003.txt
 Set-Cookie: nextcookie=data; path=/data/
 Content-Length: 69
@ -45,14 +45,14 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../data/10240002.txt
+Location: ../data/%TESTNUMBER0002.txt
 Set-Cookie: firstcookie=want; path=/want/
 Content-Length: 69
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../want/10240003.txt
+Location: ../want/%TESTNUMBER0003.txt
 Set-Cookie: nextcookie=data; path=/data/
 Content-Length: 69
@ -75,24 +75,24 @@ http
 HTTP Location: following with cookies
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/1024 -L -c log/jar1024
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1024 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /data/10240002.txt HTTP/1.1
+GET /data/%TESTNUMBER0002.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /want/10240003.txt HTTP/1.1
+GET /want/%TESTNUMBER0003.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1025
+++ b/tests/data/test1025
@ -14,7 +14,7 @@ cookies
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../data/10250002.txt
+Location: ../data/%TESTNUMBER0002.txt
 Set-Cookie: firstcookie=want; path=/want/
 Content-Length: 69
@ -25,7 +25,7 @@ This server reply is for testing a Location: following with cookies
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../want/10250003.txt
+Location: ../want/%TESTNUMBER0003.txt
 Set-Cookie: nextcookie=data; path=/data/
 Content-Length: 69
@ -45,14 +45,14 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../data/10250002.txt
+Location: ../data/%TESTNUMBER0002.txt
 Set-Cookie: firstcookie=want; path=/want/
 Content-Length: 69
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../want/10250003.txt
+Location: ../want/%TESTNUMBER0003.txt
 Set-Cookie: nextcookie=data; path=/data/
 Content-Length: 69
@ -75,26 +75,26 @@ http
 HTTP Location: following with command-line and server cookies
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/1025 -L -c log/jar1025 -b forcedcookie=yes
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER -b forcedcookie=yes
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1025 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Cookie: forcedcookie=yes
-GET /data/10250002.txt HTTP/1.1
+GET /data/%TESTNUMBER0002.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Cookie: forcedcookie=yes
-GET /want/10250003.txt HTTP/1.1
+GET /want/%TESTNUMBER0003.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1026
+++ b/tests/data/test1026
@ -28,7 +28,7 @@ curl --manual
 # Search for these two sentinel lines in the manual output; if they are found,
 # then chances are good the entire manual is there.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout1026
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout%TESTNUMBER
 </postcheck>
 </client>
--- a/tests/data/test1027
+++ b/tests/data/test1027
@ -25,7 +25,7 @@ curl --help
 # Search for these two sentinel lines in the help output; if they are found,
 # then chances are good the entire help is there.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout1027
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout%TESTNUMBER
 </postcheck>
 </client>
--- a/tests/data/test1028
+++ b/tests/data/test1028
@ -19,7 +19,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: ftp://%HOSTIP:%FTPPORT/10280002
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002
 Content-Length: 0
 Connection: close
@ -45,7 +45,7 @@ ftp
 HTTP Location: redirect to FTP URL
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/10280001 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L
 </command>
 </client>
@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/10280001 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /10280001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -63,8 +63,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 10280002
+SIZE %TESTNUMBER0002
-RETR 10280002
+RETR %TESTNUMBER0002
 QUIT
 </protocol>
 <stdout>
@ -73,7 +73,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: ftp://%HOSTIP:%FTPPORT/10280002
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002
 Content-Length: 0
 Connection: close
--- a/tests/data/test1029
+++ b/tests/data/test1029
@ -13,7 +13,7 @@ followlocation
 <reply>
 <data nocheck="yes">
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10290002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 62
 Connection: close
@ -30,14 +30,14 @@ http
 HTTP Location: and 'redirect_url' check
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1029 -w '%{redirect_url} %{url} %{exitcode} %{errormsg}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url} %{url} %{exitcode} %{errormsg}\n'
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1029 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -45,12 +45,12 @@ Accept: */*
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10290002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10290002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/1029 0 
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER 0 
 </stdout>
 </verify>
 </testcase>
--- a/tests/data/test103
+++ b/tests/data/test103
@ -27,7 +27,7 @@ ftp
 FTP RETR PORT with CWD
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/a/path/103 -P -
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P -
 </command>
 </client>
@ -46,8 +46,8 @@ CWD a
 CWD path
 PORT 127,0,0,1,0,0
 TYPE I
-SIZE 103
+SIZE %TESTNUMBER
-RETR 103
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1030
+++ b/tests/data/test1030
@ -67,9 +67,9 @@ crypto
 HTTP PUT with --anyauth authorization (picking Digest)
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1030 -T log/put1030 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put1030">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@ -80,7 +80,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1030 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -91,9 +91,9 @@ This is data we upload with PUT
 a second line
 line three
 four is the number of lines
-PUT /1030 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1030", response="01cb59db1ddaac246b072d5f5f0716d9"
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="01cb59db1ddaac246b072d5f5f0716d9"
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
--- a/tests/data/test1031
+++ b/tests/data/test1031
@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ?coolsite=yes/10310002.txt
+Location: ?coolsite=yes/%TESTNUMBER0002.txt
 Connection: close
 This server reply is for testing a simple Location: following
@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ?coolsite=yes/10310002.txt
+Location: ?coolsite=yes/%TESTNUMBER0002.txt
 Connection: close
 HTTP/1.1 200 Followed here fine swsclose
@ -53,19 +53,19 @@ http
 HTTP Location: following to a query string
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/this/1031 -L
+http://%HOSTIP:%HTTPPORT/want/this/%TESTNUMBER -L
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/this/1031 HTTP/1.1
+GET /want/this/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /want/this/1031?coolsite=yes/10310002.txt HTTP/1.1
+GET /want/this/%TESTNUMBER?coolsite=yes/%TESTNUMBER0002.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1032
+++ b/tests/data/test1032
@ -35,7 +35,7 @@ http
 HTTP HEAD with --range
 </name>
 <command>
--range 1-3 --head http://%HOSTIP:%HTTPPORT/1032
+--range 1-3 --head http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
@ -43,7 +43,7 @@ HTTP HEAD with --range
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /1032 HTTP/1.1
+HEAD /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=1-3
 User-Agent: curl/%VERSION
--- a/tests/data/test1033
+++ b/tests/data/test1033
@ -40,7 +40,7 @@ http
 HTTP GET with 102 response!
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1033
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/1033
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1033 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1034
+++ b/tests/data/test1034
@ -40,7 +40,7 @@ HTTP over proxy with malformatted IDN host name
 # This host name contains an invalid UTF-8 byte sequence that can't be
 # converted into an IDN name
 <stdin>
-url = "http://invalid-utf8-â<>.local/page/1034"
+url = "http://invalid-utf8-â<>.local/page/%TESTNUMBER"
 </stdin>
 <command>
 -K - -x %HOSTIP:%NOLISTENPORT
--- a/tests/data/test1035
+++ b/tests/data/test1035
@ -35,7 +35,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 HTTP over proxy with too long IDN host name
 </name>
 <command>
-http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 -x %HOSTIP:%NOLISTENPORT
+http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/%TESTNUMBER -x %HOSTIP:%NOLISTENPORT
 </command>
 </client>
--- a/tests/data/test1036
+++ b/tests/data/test1036
@ -31,9 +31,9 @@ ftp
 FTP download resume from end of file
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/1036 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1036.out">
+<file name="log/curl%TESTNUMBER.out">
 This is the start!!
 </file>
 </client>
@ -47,12 +47,12 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 1036
+SIZE %TESTNUMBER
 REST 20
-RETR 1036
+RETR %TESTNUMBER
 QUIT
 </protocol>
-<file name="log/curl1036.out">
+<file name="log/curl%TESTNUMBER.out">
 This is the start!!
 expected to be a file without the first part
 but we emulate that
--- a/tests/data/test1037
+++ b/tests/data/test1037
@ -31,9 +31,9 @@ ftp
 FTP download resume from end of empty file
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/1037 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1037.out">
+<file name="log/curl%TESTNUMBER.out">
 </file>
 </client>
@ -46,8 +46,8 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 1037
+SIZE %TESTNUMBER
-RETR 1037
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1038
+++ b/tests/data/test1038
@ -23,9 +23,9 @@ ftp
 FTP PASV upload resume from end of file
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/1038 -T log/upload1038 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload1038">
+<file name="log/upload%TESTNUMBER">
 this is the *****cr@p******** that we're gonna upload
 worx?
@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 1038
+SIZE %TESTNUMBER
-APPE 1038
+APPE %TESTNUMBER
 QUIT
 </protocol>
 <upload>
--- a/tests/data/test1039
+++ b/tests/data/test1039
@ -23,9 +23,9 @@ ftp
 FTP PASV upload resume from end of empty file
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/1039 -T log/upload1039 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload1039">
+<file name="log/upload%TESTNUMBER">
 this is the *****cr@p******** that we're gonna upload
 worx?
@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 1039
+SIZE %TESTNUMBER
-STOR 1039
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
--- a/tests/data/test104
+++ b/tests/data/test104
@ -21,7 +21,7 @@ ftp
 FTP --head to get file size only
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/a/path/104 --head
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER --head
 </command>
 </client>
@ -33,9 +33,9 @@ PASS ftp@example.com
 PWD
 CWD a
 CWD path
-MDTM 104
+MDTM %TESTNUMBER
 TYPE I
-SIZE 104
+SIZE %TESTNUMBER
 REST 0
 QUIT
 </protocol>
--- a/tests/data/test1040
+++ b/tests/data/test1040
@ -47,9 +47,9 @@ http
 HTTP GET with resume from end of entirely-downloaded file
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1040 -C -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1040.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@ -66,7 +66,7 @@ http://%HOSTIP:%HTTPPORT/1040 -C -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1040 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=100-
 User-Agent: curl/%VERSION
--- a/tests/data/test1041
+++ b/tests/data/test1041
@ -31,7 +31,7 @@ http
 <name>
 HTTP PUT with resume from end of already-uploaded file
 </name>
-<file name="log/test1041.txt">
+<file name="log/test%TESTNUMBER.txt">
 012345678
 012345678
 012345678
@ -44,7 +44,7 @@ HTTP PUT with resume from end of already-uploaded file
 012345678
 </file>
 <command>
-http://%HOSTIP:%HTTPPORT/1041 -Tlog/test1041.txt -C -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Tlog/test%TESTNUMBER.txt -C -
 </command>
 </client>
@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/1041 -Tlog/test1041.txt -C -
 # curl doesn't do a HEAD request on the remote file so it has no idea whether
 # it can skip part of the file or not.  Instead, it sends the entire file.
 <protocol>
-PUT /1041 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 0-99/100
 User-Agent: curl/%VERSION
--- a/tests/data/test1042
+++ b/tests/data/test1042
@ -59,9 +59,9 @@ http
 HTTP GET beyond end of entirely-downloaded file, no server resume
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1042 -C 200
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 200
 </command>
-<file name="log/curl1042.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@ -81,7 +81,7 @@ http://%HOSTIP:%HTTPPORT/1042 -C 200
 33
 </errorcode>
 <protocol>
-GET /1042 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=200-
 User-Agent: curl/%VERSION
--- a/tests/data/test1043
+++ b/tests/data/test1043
@ -58,9 +58,9 @@ http
 HTTP GET with resume from end of file
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1043 -C -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1043.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@ -71,7 +71,7 @@ http://%HOSTIP:%HTTPPORT/1043 -C -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1043 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=40-
 User-Agent: curl/%VERSION
--- a/tests/data/test1044
+++ b/tests/data/test1044
@ -32,7 +32,7 @@ ftp
 FTP download large file info with -I
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/1044 -I
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I
 </command>
 </client>
@ -43,9 +43,9 @@ USER anonymous
 PASS ftp@example.com
 PWD
 CWD blalbla
-MDTM 1044
+MDTM %TESTNUMBER
 TYPE I
-SIZE 1044
+SIZE %TESTNUMBER
 REST 0
 QUIT
 </protocol>
--- a/tests/data/test1045
+++ b/tests/data/test1045
@ -32,7 +32,7 @@ http
 HTTP GET with numeric localhost --interface
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --interface %CLIENTIP
 </command>
 </client>
@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1045 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1046
+++ b/tests/data/test1046
@ -36,7 +36,7 @@ http-ipv6
 HTTP-IPv6 GET with numeric localhost --interface
 </name>
 <command>
-g "http://%HOST6IP:%HTTP6PORT/1046" --interface ::1
+-g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ::1
 </command>
 # --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out
 <precheck>
@ -48,7 +48,7 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENT6IP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1046 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1049
+++ b/tests/data/test1049
@ -28,7 +28,7 @@ tftp
 TFTP retrieve with localhost --interface
 </name>
 <command>
-tftp://%HOSTIP:%TFTPPORT//1049 --interface %CLIENTIP
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --interface %CLIENTIP
 </command>
 </client>
@ -41,7 +41,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1049
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
--- a/tests/data/test105
+++ b/tests/data/test105
@ -31,7 +31,7 @@ ftp
 FTP user+password in URL and ASCII transfer
 </name>
 <command>
-ftp://userdude:passfellow@%HOSTIP:%FTPPORT/105 --use-ascii
+ftp://userdude:passfellow@%HOSTIP:%FTPPORT/%TESTNUMBER --use-ascii
 </command>
 </client>
@ -44,7 +44,7 @@ PWD
 EPSV
 PASV
 TYPE A
-RETR 105
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1051
+++ b/tests/data/test1051
@ -13,7 +13,7 @@ followlocation
 HTTP/1.1 301 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10510002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
@ -32,7 +32,7 @@ If this is received, the location following worked
 HTTP/1.1 301 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10510002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
@ -56,9 +56,9 @@ http
 HTTP PUT with Location: following
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/1051 -L -T log/test1051.txt
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1051.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
     file
         to
@ -80,7 +80,7 @@ the
 # server says 301 and 100 _after_ the entire PUT body has been sent.
 <protocol>
-PUT /want/1051 HTTP/1.1
+PUT /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -96,7 +96,7 @@ for
 the
   PUT
      feature
-PUT /want/data/10510002.txt?coolsite=yes HTTP/1.1
+PUT /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1052
+++ b/tests/data/test1052
@ -13,7 +13,7 @@ followlocation
 HTTP/1.0 301 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10520002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
@ -30,7 +30,7 @@ If this is received, the location following worked
 HTTP/1.0 301 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10520002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
@ -52,9 +52,9 @@ http
 HTTP 1.0 PUT with Location: following
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/1052 -0 -L -T log/test1052.txt
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -0 -L -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1052.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
     file
         to
@ -75,7 +75,7 @@ the
 # including the full request-body before it responds. So in this test the
 # server says 301 and 200 _after_ the entire PUT body has been sent.
 <protocol>
-PUT /want/1052 HTTP/1.0
+PUT /want/%TESTNUMBER HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -90,7 +90,7 @@ for
 the
   PUT
      feature
-PUT /want/data/10520002.txt?coolsite=yes HTTP/1.0
+PUT /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1053
+++ b/tests/data/test1053
@ -15,7 +15,7 @@ followlocation
 HTTP/1.1 307 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10530002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
@ -34,7 +34,7 @@ blablabla
 HTTP/1.1 307 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10530002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
@ -58,10 +58,10 @@ http
 HTTP RFC1867-type formposting from file with Location: following
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/1053 -L -F name=daniel -F tool=curl -F file=@log/test1053.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -L -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!
-<file name="log/test1053.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@ -74,7 +74,7 @@ bar
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/1053 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -90,7 +90,7 @@ Content-Disposition: form-data; name="tool"
 curl
 ------------------------------9ef8d6205763
-Content-Disposition: form-data; name="file"; filename="test1053.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 foo-
@ -98,7 +98,7 @@ This is a moo-
 bar
 ------------------------------9ef8d6205763--
-POST /we/want/data/10530002.txt?coolsite=yes HTTP/1.1
+POST /we/want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -114,7 +114,7 @@ Content-Disposition: form-data; name="tool"
 curl
 ------------------------------9ef8d6205763
-Content-Disposition: form-data; name="file"; filename="test1053.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 foo-
--- a/tests/data/test1054
+++ b/tests/data/test1054
@ -12,7 +12,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK swsclose
-Location: moo/testcase/10540002
+Location: moo/testcase/%TESTNUMBER0002
 Date: Thu, 31 Jul 2008 14:49:00 GMT
 Connection: close
@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 301 OK swsclose
-Location: moo/testcase/10540002
+Location: moo/testcase/%TESTNUMBER0002
 Date: Thu, 31 Jul 2008 14:49:00 GMT
 Connection: close
@ -47,11 +47,11 @@ http
 <name>
 HTTP POST from file with 301 redirect and --post301
 </name>
-<file name="log/test1054.txt">
+<file name="log/test%TESTNUMBER.txt">
 field=data
 </file>
 <command>
-http://%HOSTIP:%HTTPPORT/blah/1054 -L -d @log/test1054.txt --post301
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @log/test%TESTNUMBER.txt --post301
 </command>
 </client>
@ -59,14 +59,14 @@ http://%HOSTIP:%HTTPPORT/blah/1054 -L -d @log/test1054.txt --post301
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1054 HTTP/1.1
+POST /blah/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 10
 Content-Type: application/x-www-form-urlencoded
-field=dataPOST /blah/moo/testcase/10540002 HTTP/1.1
+field=dataPOST /blah/moo/testcase/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1055
+++ b/tests/data/test1055
@ -18,7 +18,7 @@ HTTP/1.1 307 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
-Location: ftp://%HOSTIP:%FTPPORT/1055
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 Content-Length: 0
 Connection: close
@ -36,9 +36,9 @@ ftp
 HTTP PUT Location: redirect to FTP URL
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1055 -L -T log/test1055.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1055.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
     file
         to
@ -55,7 +55,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1055 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -76,7 +76,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-STOR 1055
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
--- a/tests/data/test1056
+++ b/tests/data/test1056
@ -13,7 +13,7 @@ IPv6
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: http://[::1%259999]:%HTTP6PORT/moo/10560002
+Location: http://[::1%259999]:%HTTP6PORT/moo/%TESTNUMBER0002
 Date: Thu, 31 Jul 2008 14:49:00 GMT
 Connection: close
@ -27,7 +27,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: http://[::1%259999]:%HTTP6PORT/moo/10560002
+Location: http://[::1%259999]:%HTTP6PORT/moo/%TESTNUMBER0002
 Date: Thu, 31 Jul 2008 14:49:00 GMT
 Connection: close
@ -53,7 +53,7 @@ http-ipv6
 HTTP follow redirect from IPv4 to IPv6 with scope
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/1056 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/1056 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/1056 HTTP/1.1
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /moo/10560002 HTTP/1.1
+GET /moo/%TESTNUMBER0002 HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1057
+++ b/tests/data/test1057
@ -30,7 +30,7 @@ ftp
 FTP retrieve a byte-range relative to end of file
 </name>
 <command>
-r -12 ftp://%HOSTIP:%FTPPORT/1057
+-r -12 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
@ -42,9 +42,9 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 1057
+SIZE %TESTNUMBER
 REST 52
-RETR 1057
+RETR %TESTNUMBER
 ABOR
 QUIT
 </protocol>
--- a/tests/data/test1058
+++ b/tests/data/test1058
@ -33,14 +33,14 @@ http
 HTTP range relative to end of file
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/1058 -r -101
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r -101
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1058 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=-101
 User-Agent: curl/%VERSION
--- a/tests/data/test1059
+++ b/tests/data/test1059
@ -35,7 +35,7 @@ http
 HTTP CONNECT with proxytunnel to unsupported FTP URL
 </name>
 <command>
-ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT
+ftp://test-number:%TESTNUMBER/wanted/page -p -x %HOSTIP:%HTTPPORT
 </command>
 </client>
@ -47,8 +47,8 @@ ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT
 56
 </errorcode>
 <protocol>
-CONNECT test-number:1059 HTTP/1.1
+CONNECT test-number:%TESTNUMBER HTTP/1.1
-Host: test-number:1059
+Host: test-number:%TESTNUMBER
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
--- a/tests/data/test106
+++ b/tests/data/test106
@ -29,7 +29,7 @@ ftp
 FTP GET with type=A style ASCII URL using %20 codes
 </name>
 <command>
-"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces//and%20things2/106;type=A"
+"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces//and%20things2/%TESTNUMBER;type=A"
 </command>
 </client>
@ -44,7 +44,7 @@ CWD path with  spaces
 CWD and things2
 EPSV
 TYPE A
-RETR 106
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1060
+++ b/tests/data/test1060
@ -875,26 +875,26 @@ proxy
 HTTP proxy CONNECT auth Digest, large headers and data
 </name>
 <command>
-http://test.remote.haxx.se.1060:8990/path/10600002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-Host: test.remote.haxx.se.1060:8990
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
-CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-Host: test.remote.haxx.se.1060:8990
+Host: test.remote.haxx.se.%TESTNUMBER:8990
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:8990", response="e1fbed39c26f4efe284adc0e576ff638"
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="e1fbed39c26f4efe284adc0e576ff638"
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
-GET /path/10600002 HTTP/1.1
+GET /path/%TESTNUMBER0002 HTTP/1.1
-Host: test.remote.haxx.se.1060:8990
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1061
+++ b/tests/data/test1061
@ -880,26 +880,26 @@ proxy
 HTTP proxy CONNECT auth Digest, large headers and chunked data
 </name>
 <command>
-http://test.remote.haxx.se.1061:8990/path/10610002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-Host: test.remote.haxx.se.1061:8990
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
-CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-Host: test.remote.haxx.se.1061:8990
+Host: test.remote.haxx.se.%TESTNUMBER:8990
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:8990", response="4e23449fa93224834299e7282a70472c"
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="4e23449fa93224834299e7282a70472c"
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
-GET /path/10610002 HTTP/1.1
+GET /path/%TESTNUMBER0002 HTTP/1.1
-Host: test.remote.haxx.se.1061:8990
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1062
+++ b/tests/data/test1062
@ -28,7 +28,7 @@ ftp
 FTP with excessively long server command response lines, boundary condition
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/path/1062
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
@ -41,8 +41,8 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 1062
+SIZE %TESTNUMBER
-RETR 1062
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1063
+++ b/tests/data/test1063
@ -28,9 +28,9 @@ Invalid large X- range on a file://
 # This range value is 2**32+7, which will be truncated to the valid value 7
 # if the large file support is not working correctly
 <command>
-r 4294967303- file://localhost%FILE_PWD/log/test1063.txt 
+-r 4294967303- file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1063.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>
--- a/tests/data/test1064
+++ b/tests/data/test1064
@ -35,9 +35,9 @@ http
 HTTP PUT twice
 </name>
 <command>
-H "Expect:" -T log/1064 http://%HOSTIP:%HTTPPORT/1064.upload1 -T log/1064 http://%HOSTIP:%HTTPPORT/10640002.upload2
+-H "Expect:" -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.upload2
 </command>
-<file name="log/1064">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@ -45,14 +45,14 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1064.upload1 HTTP/1.1
+PUT /%TESTNUMBER.upload1 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 5
 test
-PUT /10640002.upload2 HTTP/1.1
+PUT /%TESTNUMBER0002.upload2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1065
+++ b/tests/data/test1065
@ -36,9 +36,9 @@ http
 HTTP PUT with one file but two URLs
 </name>
 <command>
-H "Expect:" -T log/1065 http://%HOSTIP:%HTTPPORT/1065.upload1 http://%HOSTIP:%HTTPPORT/10650002.url2
+-H "Expect:" -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.url2
 </command>
-<file name="log/1065">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@ -46,14 +46,14 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1065.upload1 HTTP/1.1
+PUT /%TESTNUMBER.upload1 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 5
 test
-GET /10650002.url2 HTTP/1.1
+GET /%TESTNUMBER0002.url2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1066
+++ b/tests/data/test1066
@ -35,19 +35,19 @@ http
 HTTP --dump-header - with two URLs
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/1066 http://%HOSTIP:%HTTPPORT/want/10660001 --dump-header -
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER0001 --dump-header -
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1066 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /want/10660001 HTTP/1.1
+GET /want/%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1067
+++ b/tests/data/test1067
@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/10670002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 This server reply is for testing a simple Location: following
@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/10670002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 HTTP/1.1 200 Followed here fine swsclose
@ -53,28 +53,28 @@ http
 HTTP Location: following with auto-referer
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/1067 --silent --location --referer "firstone.html;auto" --write-out "%{stderr}|%{referer}|"
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --silent --location --referer "firstone.html;auto" --write-out "%{stderr}|%{referer}|"
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1067 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Referer: firstone.html
-GET /want/data/10670002.txt?coolsite=yes HTTP/1.1
+GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-Referer: http://%HOSTIP:%HTTPPORT/want/1067
+Referer: http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </protocol>
 <stderr nonewline="yes">
-|http://%HOSTIP:%HTTPPORT/want/1067|
+|http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER|
 </stderr>
 </verify>
 </testcase>
--- a/tests/data/test1068
+++ b/tests/data/test1068
@ -29,7 +29,7 @@ http
 HTTP PUT from stdin
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/bzz/1068 -T -
+http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T -
 </command>
 <stdin>
 more than one byte
@ -39,7 +39,7 @@ more than one byte
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /bzz/1068 HTTP/1.1
+PUT /bzz/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1069
+++ b/tests/data/test1069
@ -20,7 +20,7 @@ http
 HTTP 1.0 PUT from stdin with no content length
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/bzz/1069 -T - -0
+http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T - -0
 </command>
 <stdin>
 this data can't be sent
--- a/tests/data/test107
+++ b/tests/data/test107
@ -15,7 +15,7 @@ ftp
 <name>
 FTP PASV upload file
 </name>
-<file name="log/test107.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
    to
      see
@ -24,7 +24,7 @@ works
  so does it?
 </file>
 <command>
-ftp://%HOSTIP:%FTPPORT/107 -T log/test107.txt
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
 </client>
@ -44,7 +44,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-STOR 107
+STOR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test1070
+++ b/tests/data/test1070
@ -32,9 +32,9 @@ http
 HTTP POST with server closing connection before (all) data is received
 </name>
 <command>
- -d @log/input1070 http://%HOSTIP:%HTTPPORT/1070 -H "Expect: 100-continue"
+ -d @log/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue"
 </command>
-<file name="log/input1070">
+<file name="log/input%TESTNUMBER">
 This creates the named file with this content before the test case is run,
 which is useful if the test case needs a file to act on. We create this file
 rather large (larger than your typical TCP packet) so that not all of it can nor
@ -49,7 +49,7 @@ OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /1070 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1071
+++ b/tests/data/test1071
@ -73,9 +73,9 @@ crypto
 Downgraded HTTP PUT to HTTP 1.0 with authorization
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1071 -T log/put1071 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put1071">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@ -86,7 +86,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1071 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -97,9 +97,9 @@ This is data we upload with PUT
 a second line
 line three
 four is the number of lines
-PUT /1071 HTTP/1.0
+PUT /%TESTNUMBER HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1071", response="df4cef6b52a30e65d472dd848d2055a1"
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="df4cef6b52a30e65d472dd848d2055a1"
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
--- a/tests/data/test1072
+++ b/tests/data/test1072
@ -40,7 +40,7 @@ crypto
 HTTP chunked PUT to HTTP 1.0 server with authorization
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1072 -T - -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T - -u testuser:testpass --anyauth
 </command>
 <stdin>
 This is data we upload with PUT
@ -56,7 +56,7 @@ which is impossible in HTTP/1.0
 25
 </errorcode>
 <protocol>
-PUT /1072 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1073
+++ b/tests/data/test1073
@ -18,7 +18,7 @@ chunked Transfer-Encoding
 HTTP/1.0 301 Redirect swsclose
 Server: testcurl
 Content-Type: text/plain
-Location: /newlocation/10730002
+Location: /newlocation/%TESTNUMBER0002
 Content-Length: 0
 Connection: close
@ -34,7 +34,7 @@ http
 HTTP chunked PUT to HTTP 1.0 server with redirect
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1073 -T - -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T - -L
 </command>
 <stdin>
 This is data we upload with PUT
@ -50,7 +50,7 @@ which is impossible in HTTP/1.0
 25
 </errorcode>
 <protocol>
-PUT /1073 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1074
+++ b/tests/data/test1074
@ -39,7 +39,7 @@ http
 HTTP downgrade to HTTP/1.0 on second request
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/1074 http://%HOSTIP:%HTTPPORT/wantmore/10740001
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
 </command>
 </client>
@ -60,12 +60,12 @@ surprise2
 </stdout>
 <protocol>
-GET /want/1074 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /wantmore/10740001 HTTP/1.0
+GET /wantmore/%TESTNUMBER0001 HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1075
+++ b/tests/data/test1075
@ -52,9 +52,9 @@ http
 HTTP PUT with --anyauth authorization (picking Basic)
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1075 -T log/put1075 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put1075">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@ -65,7 +65,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1075 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -76,7 +76,7 @@ This is data we upload with PUT
 a second line
 line three
 four is the number of lines
-PUT /1075 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 User-Agent: curl/%VERSION
--- a/tests/data/test1076
+++ b/tests/data/test1076
@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: moo.html&testcase=/10760002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: moo.html&testcase=/10760002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
@ -49,7 +49,7 @@ http
 HTTP POST with 302 redirect and --post302
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/blah/1076 -L -d "moo" --post302
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post302
 </command>
 </client>
@ -57,14 +57,14 @@ http://%HOSTIP:%HTTPPORT/blah/1076 -L -d "moo" --post302
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1076 HTTP/1.1
+POST /blah/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
-mooPOST /blah/moo.html&testcase=/10760002 HTTP/1.1
+mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1077
+++ b/tests/data/test1077
@ -50,7 +50,7 @@ proxy
 FTP over HTTP proxy with downgrade to HTTP 1.0
 </name>
 <command>
-x %HOSTIP:%HTTPPORT ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002
+-x %HOSTIP:%HTTPPORT ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002
 </command>
 </client>
@ -58,13 +58,13 @@ FTP over HTTP proxy with downgrade to HTTP 1.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 HTTP/1.1
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002 HTTP/1.0
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002 HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1078
+++ b/tests/data/test1078
@ -43,7 +43,7 @@ http-proxy
 HTTP 1.0 CONNECT with proxytunnel and downgrade GET to HTTP/1.0
 </name>
 <command>
--proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP.1078:%HTTPPORT/we/want/that/page/1078 http://%HOSTIP.1078:%HTTPPORT/we/want/that/page/1078
+--proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@ -54,20 +54,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT %HOSTIP.1078:%HTTPPORT HTTP/1.0
+CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.0
-Host: %HOSTIP.1078:%HTTPPORT
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 </proxy>
 <protocol>
-GET /we/want/that/page/1078 HTTP/1.1
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP.1078:%HTTPPORT
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /we/want/that/page/1078 HTTP/1.0
+GET /we/want/that/page/%TESTNUMBER HTTP/1.0
-Host: %HOSTIP.1078:%HTTPPORT
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1079
+++ b/tests/data/test1079
@ -49,7 +49,7 @@ crypto
 HTTP retry after closed connection and empty response
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1079 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
@ -59,14 +59,14 @@ http://%HOSTIP:%HTTPPORT/1079 -u testuser:testpass --digest
 52
 </errorcode>
 <protocol>
-GET /1079 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /1079 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1079", response="e340c7cdca0950462070f46ee139e9f7"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="e340c7cdca0950462070f46ee139e9f7"
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test108
+++ b/tests/data/test108
@ -21,9 +21,9 @@ ftp
 FTP PORT upload with CWD
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T log/upload108 -P -
+ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/%TESTNUMBER -T log/upload%TESTNUMBER -P -
 </command>
-<file name="log/upload108">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
 upload this
 </file>
@ -45,7 +45,7 @@ CWD STOR
 CWD RETR
 PORT 127,0,0,1,5,109
 TYPE I
-STOR 108
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
--- a/tests/data/test1080
+++ b/tests/data/test1080
@ -13,7 +13,7 @@ followlocation
 <reply>
 <data nocheck="yes">
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10800002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 62
 Connection: close
@ -30,19 +30,19 @@ http
 HTTP Location: on two URLs 'redirect_url' check
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1080 http://%HOSTIP:%HTTPPORT/we/want/our/1080 -w '%{redirect_url}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n'
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1080 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /we/want/our/1080 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -50,19 +50,19 @@ Accept: */*
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10800002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10800002.txt?coolsite=yes
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10800002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10800002.txt?coolsite=yes
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes
 </stdout>
 </verify>
 </testcase>
--- a/tests/data/test1081
+++ b/tests/data/test1081
@ -13,7 +13,7 @@ followlocation
 <reply>
 <data nocheck="yes">
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10810099.txt?coolsite=yes
+Location: data/%TESTNUMBER0099.txt?coolsite=yes
 Content-Length: 62
 Connection: close
@ -38,19 +38,19 @@ http
 HTTP no Location: on second URL 'redirect_url' check
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1081 http://%HOSTIP:%HTTPPORT/we/want/our/10810002 -w '%{redirect_url}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER0002 -w '%{redirect_url}\n'
 </command>
 </client>
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1081 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /we/want/our/10810002 HTTP/1.1
+GET /we/want/our/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -58,12 +58,12 @@ Accept: */*
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10810099.txt?coolsite=yes
+Location: data/%TESTNUMBER0099.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10810099.txt?coolsite=yes
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0099.txt?coolsite=yes
 HTTP/1.1 200 Followed here fine swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
--- a/tests/data/test1082
+++ b/tests/data/test1082
@ -32,7 +32,7 @@ http
 HTTP GET with localhost --interface
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1082 -4 --interface localhost
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -4 --interface localhost
 </command>
 <precheck>
 perl -e "print 'Test requires default test client host address' if ( '%CLIENTIP' ne '127.0.0.1' );"
@ -43,7 +43,7 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENTIP'
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1082 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1083
+++ b/tests/data/test1083
@ -36,7 +36,7 @@ http-ipv6
 HTTP-IPv6 GET with ip6-localhost --interface
 </name>
 <command>
-g "http://%HOST6IP:%HTTP6PORT/1083" --interface ip6-localhost
+-g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ip6-localhost
 </command>
 <precheck>
 perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}"
@ -47,7 +47,7 @@ perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1083 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1084
+++ b/tests/data/test1084
@ -27,7 +27,7 @@ none
 HTTP GET with invalid --interface
 </name>
 <command>
-http://%HOSTIP:%NOLISTENPORT/1084 --interface non-existing-host.haxx.se.
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --interface non-existing-host.haxx.se.
 </command>
 </client>
--- a/tests/data/test1085
+++ b/tests/data/test1085
@ -29,7 +29,7 @@ none
 HTTP-IPv6 GET with invalid --interface
 </name>
 <command>
-g "http://%HOST6IP:%NOLISTENPORT/1085" --interface non-existing-host.haxx.se.
+-g "http://%HOST6IP:%NOLISTENPORT/%TESTNUMBER" --interface non-existing-host.haxx.se.
 </command>
 # Ensure the IPv6 stack is operational before running this test (other tests
 # use the startup of the IPv6 test server as a substitute check for this).
--- a/tests/data/test1086
+++ b/tests/data/test1086
@ -87,7 +87,7 @@ ftp
 FTP download with strict timeout and slow data transfer
 </name>
 <command timeout="1">
-ftp://%HOSTIP:%FTPPORT/1086 -m 7
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -m 7
 </command>
 </client>
@ -103,8 +103,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 1086
+SIZE %TESTNUMBER
-RETR 1086
+RETR %TESTNUMBER
 </protocol>
 </verify>
 </testcase>
--- a/tests/data/test1087
+++ b/tests/data/test1087
@ -26,7 +26,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/plain
 Funny-head: yesyes
-Location: http://goto.second.host.now/10871002
+Location: http://goto.second.host.now/%TESTNUMBER1002
 Content-Length: 0
 Connection: close
@ -53,7 +53,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/plain
 Funny-head: yesyes
-Location: http://goto.second.host.now/10871002
+Location: http://goto.second.host.now/%TESTNUMBER1002
 Content-Length: 0
 Connection: close
@ -78,7 +78,7 @@ http
 HTTP, proxy with --anyauth and Location: to new host
 </name>
 <command>
-http://first.host.it.is/we/want/that/page/10871000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth
+http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth
 </command>
 <features>
 proxy
@ -89,20 +89,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
 Host: first.host.it.is
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
-GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
 Host: first.host.it.is
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
-GET http://goto.second.host.now/10871002 HTTP/1.1
+GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
 Host: goto.second.host.now
 User-Agent: curl/%VERSION
 Accept: */*
--- a/tests/data/test1088
+++ b/tests/data/test1088
@ -27,7 +27,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/plain
 Funny-head: yesyes
-Location: http://goto.second.host.now/10881002
+Location: http://goto.second.host.now/%TESTNUMBER1002
 Content-Length: 0
 Connection: close
@ -54,7 +54,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/plain
 Funny-head: yesyes
-Location: http://goto.second.host.now/10881002
+Location: http://goto.second.host.now/%TESTNUMBER1002
 Content-Length: 0
 Connection: close
@ -79,7 +79,7 @@ http
 HTTP, proxy with --anyauth and Location: to new host using location-trusted
 </name>
 <command>
-http://first.host.it.is/we/want/that/page/10881000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth
+http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth
 </command>
 <features>
 proxy
@ -90,20 +90,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
 Host: first.host.it.is
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
-GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
 Host: first.host.it.is
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
-GET http://goto.second.host.now/10881002 HTTP/1.1
+GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
 Host: goto.second.host.now
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/%VERSION
--- a/tests/data/test1089
+++ b/tests/data/test1089
@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./10890001
+Location: ./%TESTNUMBER0001
 monster
 </data>
@ -43,7 +43,7 @@ http
 HTTP GET --write-out with redirected fetch
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1089 -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>
@ -51,12 +51,12 @@ http://%HOSTIP:%HTTPPORT/1089 -w "%{num_connects}\n%{num_redirects}\n%{size_down
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1089 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /10890001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -69,7 +69,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./10890001
+Location: ./%TESTNUMBER0001
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@ -81,7 +81,7 @@ bigger monster
 2
 1
 15
-http://%HOSTIP:%HTTPPORT/10890001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 text/plain; charset=us-ascii
 200
 </stdout>
--- a/tests/data/test109
+++ b/tests/data/test109
@ -21,9 +21,9 @@ ftp
 FTP PASV upload append
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/109 -T log/upload109 --append
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER --append
 </command>
-<file name="log/upload109">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
 upload this
 </file>
@ -37,7 +37,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-APPE 109
+APPE %TESTNUMBER
 QUIT
 </protocol>
 <upload>
--- a/tests/data/test1090
+++ b/tests/data/test1090
@ -18,7 +18,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./10900001
+Location: ./%TESTNUMBER0001
 monster
 </data>
@ -50,7 +50,7 @@ http
 HTTP GET --write-out with redirected fetch and chunked reply
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1090 -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>
@ -58,12 +58,12 @@ http://%HOSTIP:%HTTPPORT/1090 -w "%{num_connects}\n%{num_redirects}\n%{size_down
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1090 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-GET /10900001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@ -76,7 +76,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./10900001
+Location: ./%TESTNUMBER0001
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@ -88,7 +88,7 @@ bigger monster
 2
 1
 15
-http://%HOSTIP:%HTTPPORT/10900001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 text/plain; charset=us-ascii
 200
 </stdout>
--- a/tests/data/test1091
+++ b/tests/data/test1091
@ -24,7 +24,7 @@ ftp
 FTP URL with type=i
 </name>
 <command>
-"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/1091;type=i" --use-ascii
+"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/%TESTNUMBER;type=i" --use-ascii
 </command>
 </client>
@ -39,8 +39,8 @@ CWD tmp
 CWD moo
 EPSV
 TYPE I
-SIZE 1091
+SIZE %TESTNUMBER
-RETR 1091
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
--- a/Show More
+++ b/Show More