tests: prevent test206, test1060, and test1061 from failing

... in case runtests.pl is invoked with non-default -b option

Fixes a regression caused by 1e29d275c643ef6aab7948f0f55a7a9397e56b42.

diff --git a/tests/data/test1060 b/tests/data/test1060
index da1be78b722562a188dcd2615e234114a567bd70..e303a8926ce3253faef1abf4b6531f1cc8e64357 100644 (file)
--- a/tests/data/test1060
+++ b/tests/data/test1060
@@ -874,7 +874,7 @@ crypto
 HTTP proxy CONNECT auth Digest, large headers and data
  </name>
  <command>
-http://test.remote.haxx.se.1060:%HTTPPORT/path/10600002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.1060:8990/path/10600002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
@@ -884,17 +884,17 @@ http://test.remote.haxx.se.1060:%HTTPPORT/path/10600002 --proxy http://%HOSTIP:%
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.haxx.se.1060:%HTTPPORT HTTP/1.1\r
-Host: test.remote.haxx.se.1060:%HTTPPORT\r
+CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.1060:8990\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.haxx.se.1060:%HTTPPORT HTTP/1.1\r
-Host: test.remote.haxx.se.1060:%HTTPPORT\r
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:%HTTPPORT", response="e1fbed39c26f4efe284adc0e576ff638"\r
+CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.1060:8990\r
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:8990", response="e1fbed39c26f4efe284adc0e576ff638"\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET /path/10600002 HTTP/1.1\r
-Host: test.remote.haxx.se.1060:%HTTPPORT\r
+Host: test.remote.haxx.se.1060:8990\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1061 b/tests/data/test1061
index 05c3209c47d488e107272ffe94365a5ff17e25e3..a1d7286317f4af8879cae78912a8283d9f894022 100644 (file)
--- a/tests/data/test1061
+++ b/tests/data/test1061
@@ -879,7 +879,7 @@ crypto
 HTTP proxy CONNECT auth Digest, large headers and chunked data
  </name>
  <command>
-http://test.remote.haxx.se.1061:%HTTPPORT/path/10610002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.1061:8990/path/10610002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
@@ -889,17 +889,17 @@ http://test.remote.haxx.se.1061:%HTTPPORT/path/10610002 --proxy http://%HOSTIP:%
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.haxx.se.1061:%HTTPPORT HTTP/1.1\r
-Host: test.remote.haxx.se.1061:%HTTPPORT\r
+CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.1061:8990\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.haxx.se.1061:%HTTPPORT HTTP/1.1\r
-Host: test.remote.haxx.se.1061:%HTTPPORT\r
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:%HTTPPORT", response="4e23449fa93224834299e7282a70472c"\r
+CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.1061:8990\r
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:8990", response="4e23449fa93224834299e7282a70472c"\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET /path/10610002 HTTP/1.1\r
-Host: test.remote.haxx.se.1061:%HTTPPORT\r
+Host: test.remote.haxx.se.1061:8990\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test206 b/tests/data/test206
index 3ddc1d995416e590d4889c32c6ae2dde577108a1..902d0a6f08c2e003c4f9c341873fba3087a1f413 100644 (file)
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -77,7 +77,7 @@ crypto
 HTTP proxy CONNECT auth Digest
  </name>
  <command>
-http://test.remote.haxx.se.206:%HTTPPORT/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.206:8990/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
@@ -87,18 +87,18 @@ http://test.remote.haxx.se.206:%HTTPPORT/path/2060002 --proxy http://%HOSTIP:%HT
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.haxx.se.206:%HTTPPORT HTTP/1.1\r
-Host: test.remote.haxx.se.206:%HTTPPORT\r
+CONNECT test.remote.haxx.se.206:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.206:8990\r
 Proxy-Connection: Keep-Alive\r
 \r
-CONNECT test.remote.haxx.se.206:%HTTPPORT HTTP/1.1\r
-Host: test.remote.haxx.se.206:%HTTPPORT\r
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.206:%HTTPPORT", response="003e36decb4dbf6366b3ecb9b87c24ec"\r
+CONNECT test.remote.haxx.se.206:8990 HTTP/1.1\r
+Host: test.remote.haxx.se.206:8990\r
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.206:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET /path/2060002 HTTP/1.1\r
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r
-Host: test.remote.haxx.se.206:%HTTPPORT\r
+Host: test.remote.haxx.se.206:8990\r
 Accept: */*\r
 \r
 [DISCONNECT]