tests: Stop referring to server ports when they're not used

Several tests referred to specific server ports even when the test
didn't actually use that server or specify that it's needed. In such
cases, the test harness substitutes the text "[not running]" as the port
number which causes many such tests to fail due to the inability to
parse the URL.  These tests are changed to use %NOLISTENPORT which will
always be substituted correctly.

diff --git a/tests/data/test1034 b/tests/data/test1034
index b4ffc8a98561e65eb32a5d532a5ab07518d9d7af..89083a294c0341fc759afb50fe590e8f363d2853 100644 (file)
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -43,7 +43,7 @@ HTTP over proxy with malformatted IDN host name
 url = "http://invalid-utf8-â\90.local/page/1034"
 </stdin>
  <command>
--K - -x %HOSTIP:%HTTPPORT
+-K - -x %HOSTIP:%NOLISTENPORT
 </command>
 </client>
 

diff --git a/tests/data/test1035 b/tests/data/test1035
index a316c51e130a25d10afc98a518154bc33da3138b..62f9d7ae89b3f633f08836fe073974fb94ec5625 100644 (file)
--- 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:%HTTPPORT
+http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 -x %HOSTIP:%NOLISTENPORT
 </command>
 </client>
 

diff --git a/tests/data/test1084 b/tests/data/test1084
index 1cfab68dcbffa6a60b9dfc2fb4dc8b653bcfeab0..db6ab5e94073bea79658fa24651a358be88fbab4 100644 (file)
--- a/tests/data/test1084
+++ b/tests/data/test1084
@@ -27,7 +27,7 @@ none
 HTTP GET with invalid --interface
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1084 --interface non-existing-host.haxx.se.
+http://%HOSTIP:%NOLISTENPORT/1084 --interface non-existing-host.haxx.se.
 </command>
 </client>
 

diff --git a/tests/data/test1085 b/tests/data/test1085
index db02e6033d1006456422bf96f16a0bb910058cf9..ac1f0629c691a83bab5d552cadc2b14f4be804d5 100644 (file)
--- a/tests/data/test1085
+++ b/tests/data/test1085
@@ -29,7 +29,7 @@ none
 HTTP-IPv6 GET with invalid --interface
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/1085" --interface non-existing-host.haxx.se.
+-g "http://%HOST6IP:%NOLISTENPORT/1085" --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).

diff --git a/tests/data/test1234 b/tests/data/test1234
index 41c4bc06d53889ab07ac5b7b0166522af28f642c..577ba51aa7ebb220130d55ac99d62591028ae9de 100644 (file)
--- a/tests/data/test1234
+++ b/tests/data/test1234
@@ -19,7 +19,7 @@ none
 abusing {}-globbing
  </name>
  <command>
-"%HOSTIP:%HTTPPORT/1234[0-1]{" "%HOSTIP:%HTTPPORT/{}{}{}{"
+"%HOSTIP:%NOLISTENPORT/1234[0-1]{" "%HOSTIP:%NOLISTENPORT/{}{}{}{"
 </command>
 </client>
 

diff --git a/tests/data/test1236 b/tests/data/test1236
index 0829be313e3b9c9ad4fa74ea070005a72c4cdde7..7408a7bae0c1d2fb0e77b1a5b20e8bb7352c45f2 100644 (file)
--- a/tests/data/test1236
+++ b/tests/data/test1236
@@ -19,7 +19,7 @@ none
  </name>
 # 2^62 == 4611686018427387904
  <command>
-"%HOSTIP:%HTTPPORT/1234[0-1]{" "%HOSTIP:%HTTPPORT/[1-4611686018427387904][1-4611686018427387904]"
+"%HOSTIP:%NOLISTENPORT/1234[0-1]{" "%HOSTIP:%NOLISTENPORT/[1-4611686018427387904][1-4611686018427387904]"
 </command>
 </client>
 

diff --git a/tests/data/test1260 b/tests/data/test1260
index 1d86ecd4e808bc7732739e073a8262dcef73da62..b246882cb8f6d85dea2b570399ddb2dc5689cf0d 100644 (file)
--- a/tests/data/test1260
+++ b/tests/data/test1260
@@ -22,7 +22,7 @@ http
 HTTP URL with rubbish after port number
  </name>
  <command>
--g "http://[%HOSTIP]:%HTTPPORT:80/we/want/1260" "http://%HOSTIP:%HTTPPORT:80/we/want/1260" "http://user@example.com:80@localhost"
+-g "http://[%HOSTIP]:%NOLISTENPORT:80/we/want/1260" "http://%HOSTIP:%NOLISTENPORT:80/we/want/1260" "http://user@example.com:80@localhost"
 </command>
 </client>
 

diff --git a/tests/data/test1263 b/tests/data/test1263
index 7462db4d42c70444d187e95f5909729c9dbc6766..88b13775eb01dfba7161e0f651f35ac0ce2162a4 100644 (file)
--- a/tests/data/test1263
+++ b/tests/data/test1263
@@ -23,7 +23,7 @@ http
 HTTP URL with rubbish after IPv6 bracket
  </name>
  <command>
--g "http://[%HOSTIP]test:%HTTPPORT/we/want/1263" "http://[%HOSTIP][%HOSTIP]:%HTTPPORT/we/want/1263" "http://user@[::1]@localhost"
+-g "http://[%HOSTIP]test:%NOLISTENPORT/we/want/1263" "http://[%HOSTIP][%HOSTIP]:%NOLISTENPORT/we/want/1263" "http://user@[::1]@localhost"
 </command>
 </client>
 

diff --git a/tests/data/test1269 b/tests/data/test1269
index c7766363327362d9ed0ea3c1536b8fc453d4f648..7cf86cab3cee04ae56748fdcbb335b8466e16a6f 100644 (file)
--- a/tests/data/test1269
+++ b/tests/data/test1269
@@ -20,7 +20,7 @@ none
 too large --retry-delay value
  </name>
  <command>
---retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%HTTPPORT/1269
+--retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%NOLISTENPORT/1269
 </command>
 </client>
 

diff --git a/tests/data/test1409 b/tests/data/test1409
index 5ceb53be3b64824d8bab927f7957f0747f6f28b6..8d54b4c951852d5651f64e359447358909e7e750 100644 (file)
--- a/tests/data/test1409
+++ b/tests/data/test1409
@@ -17,7 +17,7 @@ none
 Pass in string to -C
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1409 -C wrong
+http://%HOSTIP:%NOLISTENPORT/1409 -C wrong
 </command>
 </client>
 

diff --git a/tests/data/test1410 b/tests/data/test1410
index 97ad05698a7b571a8daf9263cee1fe4147d2781c..a8b89db3fca2b2a688573579764aa215752ae533 100644 (file)
--- a/tests/data/test1410
+++ b/tests/data/test1410
@@ -17,7 +17,7 @@ none
 Pass in negative number to --max-time
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1410 --max-time -4
+http://%HOSTIP:%NOLISTENPORT/1410 --max-time -4
 </command>
 </client>
 

diff --git a/tests/data/test1427 b/tests/data/test1427
index 03cab4b93b4490ceaf936d477e7af65b7bb322f2..648b1da56b59e4b8fbc6488dd86dbf831e30d4d9 100644 (file)
--- a/tests/data/test1427
+++ b/tests/data/test1427
@@ -15,7 +15,7 @@ none
 too large -m timeout value
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1427 -m 184467440737095510
+http://%HOSTIP:%NOLISTENPORT/1427 -m 184467440737095510
 </command>
 </client>
 

diff --git a/tests/data/test1447 b/tests/data/test1447
index d1182942eebecba876c6fb014c38bb4e91b70380..8a651f0092acd208a568e3d7d64d41f3a4db8ab7 100644 (file)
--- a/tests/data/test1447
+++ b/tests/data/test1447
@@ -24,7 +24,7 @@ proxy
 Provide illegal proxy name 
  </name>
  <command>
---proxy "http://a:b@/x" http://%HOSTIP:%HTTPPORT
+--proxy "http://a:b@/x" http://%HOSTIP:%NOLISTENPORT
 </command>
 </client>
 

diff --git a/tests/data/test1453 b/tests/data/test1453
index eaf9dd3b9e8c42372b24e1203b0c391084297c07..76b5acda4ff547743c595fc1d6232413a33e3627 100644 (file)
--- a/tests/data/test1453
+++ b/tests/data/test1453
@@ -23,7 +23,7 @@ tftp
 Too long tftp filename
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz
+tftp://%HOSTIP:%NOLISTENPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz
 </command>
 </client>
 

diff --git a/tests/data/test1508 b/tests/data/test1508
index b276b8b310a2def08b2dbcd75bd4dc98fa9cd8be..fbdc322a05bab611d48c59bb681c116e9b3bccaa 100644 (file)
--- a/tests/data/test1508
+++ b/tests/data/test1508
@@ -18,7 +18,7 @@ lib1508
 Close a multi handle without using it
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/1508
+http://%HOSTIP:%NOLISTENPORT/path/1508
 </command>
 </client>
 

diff --git a/tests/data/test1550 b/tests/data/test1550
index b78756e9a8303d30005399df5901e8cca9b976cf..bbf60f98a7be359aaeadb7c4b9f3053c5dae46b2 100644 (file)
--- a/tests/data/test1550
+++ b/tests/data/test1550
@@ -23,7 +23,7 @@ lib1550
 verify setting pipeling blacklisting options
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1550
+http://%HOSTIP:%NOLISTENPORT/1550
 </command>
 </client>
 </testcase>

diff --git a/tests/data/test2036 b/tests/data/test2036
index 0ab8b66c5c68e31b7b0cb4c31ad487eeb04b821a..4b2ec43a8193957062a8ca39fbc895fabbcbc803 100644 (file)
--- a/tests/data/test2036
+++ b/tests/data/test2036
@@ -22,7 +22,7 @@ http
 HTTP, -O with no slash at all in the URL
  </name>
  <command option="no-output">
-%HOSTIP:%HTTPPORT -O
+%HOSTIP:%NOLISTENPORT -O
 </command>
 </client>
 

diff --git a/tests/data/test219 b/tests/data/test219
index 49f17e43fd479b607432b4b003bb03d5a376986e..2b638950ef8718d61058cb15925d5bad46653e41 100644 (file)
--- a/tests/data/test219
+++ b/tests/data/test219
@@ -24,7 +24,7 @@ proxy
 try using proxy with unsupported scheme
  </name>
  <command>
--x foo://%HOSTIP:%HTTPPORT/219 http://%HOSTIP:%HTTPPORT/219
+-x foo://%HOSTIP:%NOLISTENPORT/219 http://%HOSTIP:%NOLISTENPORT/219
 </command>
 </client>
 

diff --git a/tests/data/test288 b/tests/data/test288
index e62eabd3c3c55e55b5cf02beb9b6d08cbf4d3216..26e1b842a83c55da09f1f02db12695fcc6781e32 100644 (file)
--- a/tests/data/test288
+++ b/tests/data/test288
@@ -28,7 +28,7 @@ file
 file:// with (unsupported) proxy, authentication and range
  </name>
 <setenv>
-all_proxy=http://fake:user@%HOSTIP:%HTTPPORT/
+all_proxy=http://fake:user@%HOSTIP:%NOLISTENPORT/
 </setenv>
 <command option="no-include">
 file://localhost%FILE_PWD/log/test288.txt

diff --git a/tests/data/test333 b/tests/data/test333
index 198af9c8617bc8a0d36e79c1d39876e3cdd701c7..0fd0591e8ce62d33659cd1492f9c15ce2069a182 100644 (file)
--- a/tests/data/test333
+++ b/tests/data/test333
@@ -20,7 +20,7 @@ none
 Try a non-boolean command line option with --no-
  </name>
  <command>
---no-proxy "hey" http://%HOSTIP:%HTTPPORT/333
+--no-proxy "hey" http://%HOSTIP:%NOLISTENPORT/333
 </command>
 </client>
 

diff --git a/tests/data/test501 b/tests/data/test501
index 674bc43b4aa003a919c7ca97cd6f5f2aba5b9f4a..8b3dac7ede59a9392494b8de3b589908775814bf 100644 (file)
--- a/tests/data/test501
+++ b/tests/data/test501
@@ -26,7 +26,7 @@ lib501
 simple libcurl attempt operation without URL set
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/501
+http://%HOSTIP:%NOLISTENPORT/501
 </command>
 </client>
 

diff --git a/tests/data/test504 b/tests/data/test504
index be8f95e2bbd571e9d609c7d15d87417bbca23126..351ae749f200f0571691bff1de8cfc45cb5d4c39 100644 (file)
--- a/tests/data/test504
+++ b/tests/data/test504
@@ -32,7 +32,7 @@ lib504
 simple multi through local proxy without listener
  </name>
  <command>
-http://%HOSTIP:%HTTPSPORT/504 %HOSTIP:%NOLISTENPORT
+http://%HOSTIP:%NOLISTENPORT/504 %HOSTIP:%NOLISTENPORT
 </command>
 </client>
 

diff --git a/tests/data/test632 b/tests/data/test632
index 63f5630adf110fea1c3ed99ab9624c50f96f6345..456adc604c4634ce8176bfae4bd1c361bfc91bdf 100644 (file)
--- a/tests/data/test632
+++ b/tests/data/test632
@@ -20,7 +20,7 @@ sftp
 SFTP syntactically invalid host key
  </name>
  <command>
---hostpubmd5 00 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/irrelevant-file --insecure
+--hostpubmd5 00 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%NOLISTENPORT%POSIX_PWD/log/irrelevant-file --insecure
 </command>
 </client>
 

diff --git a/tests/data/test75 b/tests/data/test75
index 115963dfa9b16ff7efab4b8f600eedfe75fd971a..7a67c638ece77926d10c298dcba2f49dd7c042ad 100644 (file)
--- a/tests/data/test75
+++ b/tests/data/test75
@@ -30,7 +30,7 @@ HTTP, urlglob retrieval with bad range
 # The error message on stdout implicitly depends on the length of the
 # URL, so refuse to run if the length is unexpected.
 <precheck>
-perl %SRCDIR/libtest/test75.pl http://%HOSTIP:%HTTPPORT/ 22
+perl %SRCDIR/libtest/test75.pl http://%HOSTIP:%NOLISTENPORT/ 22
 </precheck>
 </client>
 

diff --git a/tests/data/test76 b/tests/data/test76
index ada3a33595621e589302f23cca36b46e1d82eeb2..b6c47cd88a128199e60fa84e28c2c53f534c2383 100644 (file)
--- a/tests/data/test76
+++ b/tests/data/test76
@@ -22,7 +22,7 @@ http
 HTTP, -O with no file name part in the URL
  </name>
  <command option="no-output">
-http://%HOSTIP:%HTTPPORT/76/ -O
+http://%HOSTIP:%NOLISTENPORT/76/ -O
 </command>
 </client>