Skip to content

Commit 1fea117

Browse files
xiaocangxiaocang
authored
tests: use random port numbers instead of fixed port number to prevent conflict. (#2025)
1 parent a7444ab commit 1fea117

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎t/109-timer-hup.t‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ lua found 100 pending timers
336336
lua_shared_dict test_dict 1m;
337337
338338
server {
339-
listen 12355;
339+
listen $TEST_NGINX_RAND_PORT_1;
340340
location = /foo {
341341
echo 'foo';
342342
}
@@ -350,7 +350,7 @@ lua found 100 pending timers
350350
351351
-- Connect the socket
352352
local sock = ngx.socket.tcp()
353-
local ok,err = sock:connect("127.0.0.1", 12355)
353+
local ok,err = sock:connect("127.0.0.1", $TEST_NGINX_RAND_PORT_1)
354354
if not ok then
355355
ngx.log(ngx.ERR, err)
356356
end

‎t/138-balancer.t‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -535,16 +535,16 @@ failed to set more tries: reduced tries due to limit
535535
lua_package_path "../lua-resty-core/lib/?.lua;;";
536536
537537
server {
538-
listen 127.0.0.1:8888;
538+
listen 127.0.0.1:$TEST_NGINX_RAND_PORT_1;
539539
540540
location / {
541541
return 200 "it works";
542542
}
543543
}
544544
545545
upstream foo {
546-
server 127.0.0.1:8888 max_fails=0;
547-
server 127.0.0.1:8889 max_fails=0 weight=9999;
546+
server 127.0.0.1:$TEST_NGINX_RAND_PORT_1 max_fails=0;
547+
server 127.0.0.1:$TEST_NGINX_RAND_PORT_2 max_fails=0 weight=9999;
548548
549549
balancer_by_lua_block {
550550
local bal = require "ngx.balancer"

‎t/139-ssl-cert-by.t‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ received memc reply: OK
456456
=== TEST 5: ngx.exit(0) - no yield
457457
--- http_config
458458
server {
459-
listen 127.0.0.2:8080 ssl;
459+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
460460
server_name test.com;
461461
ssl_certificate_by_lua_block {
462462
ngx.exit(0)
@@ -484,7 +484,7 @@ received memc reply: OK
484484

485485
sock:settimeout(2000)
486486

487-
local ok, err = sock:connect("127.0.0.2", 8080)
487+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
488488
if not ok then
489489
ngx.say("failed to connect: ", err)
490490
return
@@ -523,7 +523,7 @@ should never reached here
523523
=== TEST 6: ngx.exit(ngx.ERROR) - no yield
524524
--- http_config
525525
server {
526-
listen 127.0.0.2:8080 ssl;
526+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
527527
server_name test.com;
528528
ssl_certificate_by_lua_block {
529529
ngx.exit(ngx.ERROR)
@@ -551,7 +551,7 @@ should never reached here
551551

552552
sock:settimeout(2000)
553553

554-
local ok, err = sock:connect("127.0.0.2", 8080)
554+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
555555
if not ok then
556556
ngx.say("failed to connect: ", err)
557557
return
@@ -593,7 +593,7 @@ should never reached here
593593
=== TEST 7: ngx.exit(0) - yield
594594
--- http_config
595595
server {
596-
listen 127.0.0.2:8080 ssl;
596+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
597597
server_name test.com;
598598
ssl_certificate_by_lua_block {
599599
ngx.sleep(0.001)
@@ -623,7 +623,7 @@ should never reached here
623623

624624
sock:settimeout(2000)
625625

626-
local ok, err = sock:connect("127.0.0.2", 8080)
626+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
627627
if not ok then
628628
ngx.say("failed to connect: ", err)
629629
return
@@ -662,7 +662,7 @@ should never reached here
662662
=== TEST 8: ngx.exit(ngx.ERROR) - yield
663663
--- http_config
664664
server {
665-
listen 127.0.0.2:8080 ssl;
665+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
666666
server_name test.com;
667667
ssl_certificate_by_lua_block {
668668
ngx.sleep(0.001)
@@ -692,7 +692,7 @@ should never reached here
692692

693693
sock:settimeout(2000)
694694

695-
local ok, err = sock:connect("127.0.0.2", 8080)
695+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
696696
if not ok then
697697
ngx.say("failed to connect: ", err)
698698
return
@@ -734,7 +734,7 @@ should never reached here
734734
=== TEST 9: lua exception - no yield
735735
--- http_config
736736
server {
737-
listen 127.0.0.2:8080 ssl;
737+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
738738
server_name test.com;
739739
ssl_certificate_by_lua_block {
740740
error("bad bad bad")
@@ -762,7 +762,7 @@ should never reached here
762762

763763
sock:settimeout(2000)
764764

765-
local ok, err = sock:connect("127.0.0.2", 8080)
765+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
766766
if not ok then
767767
ngx.say("failed to connect: ", err)
768768
return
@@ -805,7 +805,7 @@ should never reached here
805805
=== TEST 10: lua exception - yield
806806
--- http_config
807807
server {
808-
listen 127.0.0.2:8080 ssl;
808+
listen 127.0.0.2:$TEST_NGINX_RAND_PORT_1 ssl;
809809
server_name test.com;
810810
ssl_certificate_by_lua_block {
811811
ngx.sleep(0.001)
@@ -834,7 +834,7 @@ should never reached here
834834

835835
sock:settimeout(2000)
836836

837-
local ok, err = sock:connect("127.0.0.2", 8080)
837+
local ok, err = sock:connect("127.0.0.2", $TEST_NGINX_RAND_PORT_1)
838838
if not ok then
839839
ngx.say("failed to connect: ", err)
840840
return

0 commit comments

Comments
 (0)