Skip to content

Commit bd9964e

Browse files
committed
tests: fixed some test cases failing with the 1.15.8 nginx core.
1 parent c2940c1 commit bd9964e

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

t/058-tcp-socket.t

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3720,10 +3720,10 @@ sudo iptables -I OUTPUT 1 -p udp --dport 10086 -j REJECT
37203720
}
37213721
--- request
37223722
GET /t
3723-
--- response_body
3724-
failed to connect: www.google.com could not be resolved
3725-
failed to connect: www.google.com could not be resolved
3726-
failed to connect: www.google.com could not be resolved
3723+
--- response_body_like
3724+
failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
3725+
failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
3726+
failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
37273727
hello!
37283728
--- error_log eval
37293729
qr{\[alert\] .*? send\(\) failed \(\d+: Operation not permitted\) while resolving}

t/124-init-worker.t

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ second line received: Server: openresty
550550
else
551551
say("connect: ", ok, " ", err)
552552
end
553+
done = true
553554
end
554555
555556
local ok, err = ngx.timer.at(0, handler)
@@ -600,6 +601,7 @@ qr/connect\(\) failed \(\d+: Connection refused\), context: ngx\.timer$/
600601
else
601602
say("connect: ", ok, " ", err)
602603
end
604+
done = true
603605
end
604606
605607
local ok, err = ngx.timer.at(0, handler)
@@ -650,6 +652,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
650652
else
651653
say("connect: ", ok, " ", err)
652654
end
655+
done = true
653656
end
654657
655658
local ok, err = ngx.timer.at(0, handler)

t/129-ssl-socket.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,13 +1333,13 @@ failed to send http request: closed
13331333
--- grep_error_log_out
13341334
--- error_log eval
13351335
[
1336-
qr/\[crit\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
1336+
qr/\[(crit|error)\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
13371337
'lua ssl server name: "openresty.org"',
13381338
]
13391339
--- no_error_log
13401340
SSL reused session
1341-
[error]
13421341
[alert]
1342+
[emerg]
13431343
--- timeout: 5
13441344
13451345

0 commit comments

Comments
 (0)