summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2020-04-30 16:00:31 +0200
committerDan Fandrich <dan@coneharvesters.com>2020-04-30 16:00:31 +0200
commit5f5a7b478a7f6bf51929379e1e39dc37803a9689 (patch)
tree8039fc8c143502d8176756c532abfa835dbaaed3
parent42d8d9a7e816f14226819cdc2440e11ef004230e (diff)
downloadcurl-5f5a7b478a7f6bf51929379e1e39dc37803a9689.tar.gz
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.
Diffstat
-rw-r--r--tests/data/test10342
-rw-r--r--tests/data/test10352
-rw-r--r--tests/data/test10842
-rw-r--r--tests/data/test10852
-rw-r--r--tests/data/test12342
-rw-r--r--tests/data/test12362
-rw-r--r--tests/data/test12602
-rw-r--r--tests/data/test12632
-rw-r--r--tests/data/test12692
-rw-r--r--tests/data/test14092
-rw-r--r--tests/data/test14102
-rw-r--r--tests/data/test14272
-rw-r--r--tests/data/test14472
-rw-r--r--tests/data/test14532
-rw-r--r--tests/data/test15082
-rw-r--r--tests/data/test15502
-rw-r--r--tests/data/test20362
-rw-r--r--tests/data/test2192
-rw-r--r--tests/data/test2882
-rw-r--r--tests/data/test3332
-rw-r--r--tests/data/test5012
-rw-r--r--tests/data/test5042
-rw-r--r--tests/data/test6322
-rw-r--r--tests/data/test752
-rw-r--r--tests/data/test762
25 files changed, 25 insertions, 25 deletions
diff --git a/tests/data/test1034 b/tests/data/test1034
index b4ffc8a98..89083a294 100644
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -43,7 +43,7 @@ HTTP over proxy with malformatted IDN host name
url = "http://invalid-utf8-.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 a316c51e1..62f9d7ae8 100644
--- 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 1cfab68dc..db6ab5e94 100644
--- 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 db02e6033..ac1f0629c 100644
--- 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 41c4bc06d..577ba51aa 100644
--- 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 0829be313..7408a7bae 100644
--- 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 1d86ecd4e..b246882cb 100644
--- 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 7462db4d4..88b13775e 100644
--- 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 c77663633..7cf86cab3 100644
--- 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 5ceb53be3..8d54b4c95 100644
--- 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 97ad05698..a8b89db3f 100644
--- 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 03cab4b93..648b1da56 100644
--- 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 d1182942e..8a651f009 100644
--- 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 eaf9dd3b9..76b5acda4 100644
--- 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 b276b8b31..fbdc322a0 100644
--- 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 b78756e9a..bbf60f98a 100644
--- 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 0ab8b66c5..4b2ec43a8 100644
--- 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 49f17e43f..2b638950e 100644
--- 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 e62eabd3c..26e1b842a 100644
--- 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 198af9c86..0fd0591e8 100644
--- 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 674bc43b4..8b3dac7ed 100644
--- 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 be8f95e2b..351ae749f 100644
--- 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 63f5630ad..456adc604 100644
--- 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 115963dfa..7a67c638e 100644
--- 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 ada3a3359..b6c47cd88 100644
--- 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>
View Lorry Controller Status