Skip to content

Commit 568fc76

Browse files
author
Johnny
authored
tests: fixed port conflicts when running test in parallel. (#317)
1 parent 64b2faf commit 568fc76

File tree

4 files changed

+54
-56
lines changed

4 files changed

+54
-56
lines changed

‎t/ocsp.t

+4-4
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ FIXME: check the OCSP staple actually received by the ssl client
14031403
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
14041404
14051405
server {
1406-
listen 127.0.0.2:23456 ssl;
1406+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
14071407
server_name test.com;
14081408
ssl_certificate_by_lua_block {
14091409
local ssl = require "ngx.ssl"
@@ -1444,7 +1444,7 @@ FIXME: check the OCSP staple actually received by the ssl client
14441444
14451445
sock:settimeout(3000)
14461446
1447-
local ok, err = sock:connect("127.0.0.2", 23456)
1447+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
14481448
if not ok then
14491449
ngx.say("failed to connect: ", err)
14501450
return
@@ -1485,7 +1485,7 @@ ocsp status resp set ok: nil,
14851485
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
14861486
14871487
server {
1488-
listen 127.0.0.2:23456 ssl;
1488+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
14891489
server_name test.com;
14901490
ssl_certificate_by_lua_block {
14911491
local ssl = require "ngx.ssl"
@@ -1526,7 +1526,7 @@ ocsp status resp set ok: nil,
15261526
15271527
sock:settimeout(3000)
15281528
1529-
local ok, err = sock:connect("127.0.0.2", 23456)
1529+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
15301530
if not ok then
15311531
ngx.say("failed to connect: ", err)
15321532
return

‎t/ssl.t

+18-19
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ no_long_string();
1616
env_to_nginx("PATH=" . $ENV{'PATH'});
1717
$ENV{TEST_NGINX_LUA_PACKAGE_PATH} = "$t::TestCore::lua_package_path";
1818
$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
19-
$ENV{TEST_NGINX_SERVER_SSL_PORT} ||= 4443;
2019

2120
run_tests();
2221

@@ -555,7 +554,7 @@ qr/Using unix socket file .*?nginx\.sock/
555554
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
556555
557556
server {
558-
listen 127.0.0.1:12345 ssl;
557+
listen 127.0.0.1:$TEST_NGINX_RAND_PORT_1 ssl;
559558
server_name test.com;
560559
ssl_certificate_by_lua_block {
561560
local ssl = require "ngx.ssl"
@@ -601,7 +600,7 @@ qr/Using unix socket file .*?nginx\.sock/
601600
602601
sock:settimeout(3000)
603602
604-
local ok, err = sock:connect("127.0.0.1", 12345)
603+
local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_RAND_PORT_1)
605604
if not ok then
606605
ngx.say("failed to connect: ", err)
607606
return
@@ -674,7 +673,7 @@ Using IPv4 address: 127.0.0.1
674673
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
675674
676675
server {
677-
listen [::1]:12345 ssl;
676+
listen [::1]:$TEST_NGINX_RAND_PORT_1 ssl;
678677
server_name test.com;
679678
ssl_certificate_by_lua_block {
680679
local ssl = require "ngx.ssl"
@@ -720,7 +719,7 @@ Using IPv4 address: 127.0.0.1
720719
721720
sock:settimeout(3000)
722721
723-
local ok, err = sock:connect("[::1]", 12345)
722+
local ok, err = sock:connect("[::1]", $TEST_NGINX_RAND_PORT_1)
724723
if not ok then
725724
ngx.say("failed to connect: ", err)
726725
return
@@ -1042,7 +1041,7 @@ lua ssl server name: "test.com"
10421041
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
10431042
10441043
server {
1045-
listen 127.0.0.2:23456 ssl;
1044+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
10461045
server_name test.com;
10471046
ssl_certificate_by_lua_block {
10481047
local ssl = require "ngx.ssl"
@@ -1078,7 +1077,7 @@ lua ssl server name: "test.com"
10781077
10791078
sock:settimeout(3000)
10801079
1081-
local ok, err = sock:connect("127.0.0.2", 23456)
1080+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
10821081
if not ok then
10831082
ngx.say("failed to connect: ", err)
10841083
return
@@ -1118,7 +1117,7 @@ got TLS1 version: SSLv3,
11181117
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
11191118
11201119
server {
1121-
listen 127.0.0.2:23456 ssl;
1120+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
11221121
server_name test.com;
11231122
ssl_certificate_by_lua_block {
11241123
local ssl = require "ngx.ssl"
@@ -1154,7 +1153,7 @@ got TLS1 version: SSLv3,
11541153
11551154
sock:settimeout(3000)
11561155
1157-
local ok, err = sock:connect("127.0.0.2", 23456)
1156+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
11581157
if not ok then
11591158
ngx.say("failed to connect: ", err)
11601159
return
@@ -1194,7 +1193,7 @@ got TLS1 version: TLSv1,
11941193
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
11951194
11961195
server {
1197-
listen 127.0.0.2:23456 ssl;
1196+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
11981197
server_name test.com;
11991198
ssl_certificate_by_lua_block {
12001199
local ssl = require "ngx.ssl"
@@ -1230,7 +1229,7 @@ got TLS1 version: TLSv1,
12301229
12311230
sock:settimeout(3000)
12321231
1233-
local ok, err = sock:connect("127.0.0.2", 23456)
1232+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
12341233
if not ok then
12351234
ngx.say("failed to connect: ", err)
12361235
return
@@ -1270,7 +1269,7 @@ got TLS1 version: TLSv1.1,
12701269
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
12711270
12721271
server {
1273-
listen 127.0.0.2:23456 ssl;
1272+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
12741273
server_name test.com;
12751274
ssl_certificate_by_lua_block {
12761275
local ssl = require "ngx.ssl"
@@ -1306,7 +1305,7 @@ got TLS1 version: TLSv1.1,
13061305
13071306
sock:settimeout(3000)
13081307
1309-
local ok, err = sock:connect("127.0.0.2", 23456)
1308+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
13101309
if not ok then
13111310
ngx.say("failed to connect: ", err)
13121311
return
@@ -1346,7 +1345,7 @@ got TLS1 version: TLSv1.2,
13461345
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
13471346
13481347
server {
1349-
listen 127.0.0.2:23456 ssl;
1348+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
13501349
server_name test.com;
13511350
ssl_certificate_by_lua_block {
13521351
local semaphore = require "ngx.semaphore"
@@ -1389,7 +1388,7 @@ got TLS1 version: TLSv1.2,
13891388
13901389
sock:settimeout(3000)
13911390
1392-
local ok, err = sock:connect("127.0.0.2", 23456)
1391+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
13931392
if not ok then
13941393
ngx.say("failed to connect: ", err)
13951394
return
@@ -2072,7 +2071,7 @@ qr/\[error\] .*? failed to parse pem key: PEM_read_bio_PrivateKey\(\) failed/
20722071
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
20732072
20742073
server {
2075-
listen 127.0.0.1:12345 ssl;
2074+
listen 127.0.0.1:$TEST_NGINX_RAND_PORT_1 ssl;
20762075
server_name test.com;
20772076
ssl_certificate_by_lua_block {
20782077
local ssl = require "ngx.ssl"
@@ -2103,7 +2102,7 @@ qr/\[error\] .*? failed to parse pem key: PEM_read_bio_PrivateKey\(\) failed/
21032102
21042103
sock:settimeout(3000)
21052104
2106-
local ok, err = sock:connect("127.0.0.1", 12345)
2105+
local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_RAND_PORT_1)
21072106
if not ok then
21082107
ngx.say("failed to connect: ", err)
21092108
return
@@ -2176,7 +2175,7 @@ client ip: 127.0.0.1
21762175
lua_shared_dict done 16k;
21772176
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
21782177
server {
2179-
listen $TEST_NGINX_SERVER_SSL_PORT ssl;
2178+
listen $TEST_NGINX_RAND_PORT_1 ssl;
21802179
server_name test.com;
21812180
ssl_session_tickets off;
21822181
ssl_certificate ../../cert/test2.crt;
@@ -2224,7 +2223,7 @@ client ip: 127.0.0.1
22242223
ngx.shared.done:delete("handshake")
22252224
local addr = ngx.var.addr;
22262225
local req = "'GET / HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n'"
2227-
local f, err = io.popen("echo -n " .. req .. " | timeout 3s openssl s_client -connect 127.0.0.1:$TEST_NGINX_SERVER_SSL_PORT")
2226+
local f, err = io.popen("echo -n " .. req .. " | timeout 3s openssl s_client -connect 127.0.0.1:$TEST_NGINX_RAND_PORT_1")
22282227
if not f then
22292228
ngx.say(err)
22302229
return

‎t/stream/balancer-timeout.t

+14-14
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ __DATA__
4646
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
4747
4848
server {
49-
listen 23456;
49+
listen $TEST_NGINX_RAND_PORT_1;
5050
return "fake origin\n";
5151
}
5252
@@ -55,7 +55,7 @@ __DATA__
5555
balancer_by_lua_block {
5656
local b = require "ngx.balancer"
5757
assert(b.set_timeouts(1.234, 5.678, 7.689))
58-
assert(b.set_current_peer("127.0.0.1", tonumber(23456)))
58+
assert(b.set_current_peer("127.0.0.1", tonumber($TEST_NGINX_RAND_PORT_1)))
5959
}
6060
}
6161
--- stream_server_config
@@ -78,7 +78,7 @@ event timer add: \d+: 7689:
7878
proxy_connect_timeout 1234ms;
7979
8080
server {
81-
listen 23456;
81+
listen $TEST_NGINX_RAND_PORT_1;
8282
return "fake origin\n";
8383
}
8484
@@ -87,7 +87,7 @@ event timer add: \d+: 7689:
8787
balancer_by_lua_block {
8888
local b = require "ngx.balancer"
8989
assert(b.set_timeouts(nil, 5.678, 7.689))
90-
assert(b.set_current_peer("127.0.0.1", tonumber(23456)))
90+
assert(b.set_current_peer("127.0.0.1", tonumber($TEST_NGINX_RAND_PORT_1)))
9191
}
9292
}
9393
--- stream_server_config
@@ -110,7 +110,7 @@ event timer add: \d+: 7689:
110110
proxy_timeout 5678ms;
111111
112112
server {
113-
listen 23456;
113+
listen $TEST_NGINX_RAND_PORT_1;
114114
return "fake origin\n";
115115
}
116116
@@ -119,7 +119,7 @@ event timer add: \d+: 7689:
119119
balancer_by_lua_block {
120120
local b = require "ngx.balancer"
121121
assert(b.set_timeouts(1.234, nil, 7.689))
122-
assert(b.set_current_peer("127.0.0.1", tonumber(23456)))
122+
assert(b.set_current_peer("127.0.0.1", tonumber($TEST_NGINX_RAND_PORT_1)))
123123
}
124124
}
125125
--- stream_server_config
@@ -142,7 +142,7 @@ event timer add: \d+: 7689:
142142
proxy_timeout 7689ms;
143143
144144
server {
145-
listen 23456;
145+
listen $TEST_NGINX_RAND_PORT_1;
146146
return "fake origin\n";
147147
}
148148
@@ -151,7 +151,7 @@ event timer add: \d+: 7689:
151151
balancer_by_lua_block {
152152
local b = require "ngx.balancer"
153153
assert(b.set_timeouts(1.234, 5.678, nil))
154-
assert(b.set_current_peer("127.0.0.1", tonumber(23456)))
154+
assert(b.set_current_peer("127.0.0.1", tonumber($TEST_NGINX_RAND_PORT_1)))
155155
}
156156
}
157157
--- stream_server_config
@@ -177,7 +177,7 @@ event timer add: \d+: 5678:
177177
balancer_by_lua_block {
178178
local b = require "ngx.balancer"
179179
assert(b.set_timeouts(0, 1.234, 5.678))
180-
assert(b.set_current_peer("127.0.0.1", tonumber(23456)))
180+
assert(b.set_current_peer("127.0.0.1", tonumber($TEST_NGINX_RAND_PORT_1)))
181181
}
182182
}
183183
--- stream_server_config
@@ -198,7 +198,7 @@ qr/\[error\] .*? balancer_by_lua:3: bad connect timeout/
198198
balancer_by_lua_block {
199199
local b = require "ngx.balancer"
200200
assert(b.set_timeouts(-1, 1.234, 5.678))
201-
assert(b.set_current_peer("127.0.0.1", tonumber(23456)))
201+
assert(b.set_current_peer("127.0.0.1", tonumber($TEST_NGINX_RAND_PORT_1)))
202202
}
203203
}
204204
--- stream_server_config
@@ -219,7 +219,7 @@ qr/\[error\] .*? balancer_by_lua:3: bad connect timeout/
219219
balancer_by_lua_block {
220220
local b = require "ngx.balancer"
221221
assert(b.set_timeouts(1.234, 0, 5.678))
222-
assert(b.set_current_peer("127.0.0.1", tonumber(23456)))
222+
assert(b.set_current_peer("127.0.0.1", tonumber($TEST_NGINX_RAND_PORT_1)))
223223
}
224224
}
225225
--- stream_server_config
@@ -240,7 +240,7 @@ qr/\[error\] .*? balancer_by_lua:3: bad send timeout/
240240
balancer_by_lua_block {
241241
local b = require "ngx.balancer"
242242
assert(b.set_timeouts(1.234, -1, 5.678))
243-
assert(b.set_current_peer("127.0.0.1", tonumber(23456)))
243+
assert(b.set_current_peer("127.0.0.1", tonumber($TEST_NGINX_RAND_PORT_1)))
244244
}
245245
}
246246
--- stream_server_config
@@ -261,7 +261,7 @@ qr/\[error\] .*? balancer_by_lua:3: bad send timeout/
261261
balancer_by_lua_block {
262262
local b = require "ngx.balancer"
263263
assert(b.set_timeouts(1.234, 4.567, 0))
264-
assert(b.set_current_peer("127.0.0.1", tonumber(23456)))
264+
assert(b.set_current_peer("127.0.0.1", tonumber($TEST_NGINX_RAND_PORT_1)))
265265
}
266266
}
267267
--- stream_server_config
@@ -282,7 +282,7 @@ qr/\[error\] .*? balancer_by_lua:3: bad read timeout/
282282
balancer_by_lua_block {
283283
local b = require "ngx.balancer"
284284
assert(b.set_timeouts(1.234, 4.567, -1))
285-
assert(b.set_current_peer("127.0.0.1", tonumber(23456)))
285+
assert(b.set_current_peer("127.0.0.1", tonumber($TEST_NGINX_RAND_PORT_1)))
286286
}
287287
}
288288
--- stream_server_config

0 commit comments

Comments
 (0)