Skip to content

Commit d87d382

Browse files
committed
tests: fixed test failures in 129-ssl-socket.t by relaxed the cipher checks and allow longer latency.
1 parent 8039f7a commit d87d382

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

t/129-ssl-socket.t

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ SSL reused session
741741

742742
content_by_lua_block {
743743
local sock = ngx.socket.tcp()
744-
sock:settimeout(2000)
744+
sock:settimeout(3000)
745745

746746
do
747747
local ok, err = sock:connect("openresty.org", 443)
@@ -1122,9 +1122,11 @@ close: 1 nil
11221122
qr/^lua ssl save session: ([0-9A-F]+):2
11231123
lua ssl free session: ([0-9A-F]+):1
11241124
$/
1125-
--- error_log
1126-
lua ssl server name: "openresty.org"
1127-
SSL: TLSv1.2, cipher: "ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2
1125+
--- error_log eval
1126+
[
1127+
'lua ssl server name: "openresty.org"',
1128+
qr/SSL: TLSv1\.2, cipher: "ECDHE-RSA-AES(?:256|128)-GCM-SHA(?:384|256) TLSv1\.2/,
1129+
]
11281130
--- no_error_log
11291131
SSL reused session
11301132
[error]
@@ -1271,9 +1273,11 @@ close: 1 nil
12711273
qr/^lua ssl save session: ([0-9A-F]+):2
12721274
lua ssl free session: ([0-9A-F]+):1
12731275
$/
1274-
--- error_log
1275-
lua ssl server name: "openresty.org"
1276-
SSL: TLSv1, cipher: "ECDHE-RSA-AES256-SHA
1276+
--- error_log eval
1277+
[
1278+
'lua ssl server name: "openresty.org"',
1279+
qr/SSL: TLSv1, cipher: "ECDHE-RSA-AES(?:256|128)-SHA\b/,
1280+
]
12771281
--- no_error_log
12781282
SSL reused session
12791283
[error]

0 commit comments

Comments
 (0)