Skip to content

Commit 0846f27

Browse files
committed
tests: increased the timeout threshold for the test cases involved with expensive SSL handshakes to prevent them from getting timed out on slow boxes.
1 parent 75eaf07 commit 0846f27

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

t/129-ssl-socket.t

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,7 +1654,7 @@ attempt to call method 'sslhandshake' (a nil value)
16541654
content_by_lua '
16551655
do
16561656
local sock = ngx.socket.tcp()
1657-
sock:settimeout(2000)
1657+
sock:settimeout(3000)
16581658
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
16591659
if not ok then
16601660
ngx.say("failed to connect: ", err)
@@ -1728,7 +1728,7 @@ lua ssl server name:
17281728
SSL reused session
17291729
[error]
17301730
[alert]
1731-
--- timeout: 3
1731+
--- timeout: 5
17321732
17331733
17341734
@@ -1759,7 +1759,7 @@ SSL reused session
17591759
content_by_lua '
17601760
do
17611761
local sock = ngx.socket.tcp()
1762-
sock:settimeout(2000)
1762+
sock:settimeout(3000)
17631763
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
17641764
if not ok then
17651765
ngx.say("failed to connect: ", err)
@@ -1834,7 +1834,7 @@ lua ssl server name: "test.com"
18341834
SSL reused session
18351835
[error]
18361836
[alert]
1837-
--- timeout: 3
1837+
--- timeout: 5
18381838
18391839
18401840
@@ -1957,7 +1957,7 @@ SSL reused session
19571957
do
19581958
local sock = ngx.socket.tcp()
19591959
1960-
sock:settimeout(2000)
1960+
sock:settimeout(3000)
19611961
19621962
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
19631963
if not ok then
@@ -2023,7 +2023,7 @@ lua ssl server name: "test.com"
20232023
SSL reused session
20242024
[error]
20252025
[alert]
2026-
--- timeout: 3
2026+
--- timeout: 5
20272027
20282028
20292029
@@ -2190,7 +2190,7 @@ SSL reused session
21902190
content_by_lua '
21912191
do
21922192
local sock = ngx.socket.tcp()
2193-
sock:settimeout(2000)
2193+
sock:settimeout(3000)
21942194
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
21952195
if not ok then
21962196
ngx.say("failed to connect: ", err)
@@ -2232,7 +2232,7 @@ lua ssl server name:
22322232
SSL reused session
22332233
[error]
22342234
[alert]
2235-
--- timeout: 3
2235+
--- timeout: 5
22362236
22372237
22382238
@@ -2261,7 +2261,7 @@ SSL reused session
22612261
content_by_lua '
22622262
do
22632263
local sock = ngx.socket.tcp()
2264-
sock:settimeout(2000)
2264+
sock:settimeout(3000)
22652265
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
22662266
if not ok then
22672267
ngx.say("failed to connect: ", err)
@@ -2306,7 +2306,7 @@ lua ssl server name:
23062306
SSL reused session
23072307
[error]
23082308
[alert]
2309-
--- timeout: 3
2309+
--- timeout: 5
23102310
23112311
23122312
@@ -2334,7 +2334,7 @@ SSL reused session
23342334
23352335
content_by_lua '
23362336
local sock = ngx.socket.tcp()
2337-
sock:settimeout(2000)
2337+
sock:settimeout(3000)
23382338
for i = 1, 2 do
23392339
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
23402340
if not ok then
@@ -2383,7 +2383,7 @@ lua ssl server name:
23832383
SSL reused session
23842384
[error]
23852385
[alert]
2386-
--- timeout: 3
2386+
--- timeout: 5
23872387
23882388
23892389
@@ -2414,7 +2414,7 @@ SSL reused session
24142414
content_by_lua '
24152415
do
24162416
local sock = ngx.socket.tcp()
2417-
sock:settimeout(2000)
2417+
sock:settimeout(3000)
24182418
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
24192419
if not ok then
24202420
ngx.say("failed to connect: ", err)
@@ -2488,7 +2488,7 @@ $/
24882488
SSL reused session
24892489
[error]
24902490
[alert]
2491-
--- timeout: 3
2491+
--- timeout: 5
24922492
24932493
24942494
@@ -2519,7 +2519,7 @@ SSL reused session
25192519
content_by_lua '
25202520
do
25212521
local sock = ngx.socket.tcp()
2522-
sock:settimeout(2000)
2522+
sock:settimeout(3000)
25232523
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
25242524
if not ok then
25252525
ngx.say("failed to connect: ", err)
@@ -2581,5 +2581,5 @@ lua ssl certificate verify error: (18: self signed certificate)
25812581
--- no_error_log
25822582
SSL reused session
25832583
[alert]
2584-
--- timeout: 3
2584+
--- timeout: 5
25852585

0 commit comments

Comments
 (0)