Skip to content

tests: stabilize flaky tests in CI #2523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tzssangglass wants to merge 3 commits into
base: master
Choose a base branch
from
+56 −57
Open

tests: stabilize flaky tests in CI #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e70d333
tests: fix flaky t/189-http2-subreq-error-wakeup.t and t/024-access/o…
tzssangglass Sep 8, 2026
51fd7ff
tests: fix flaky t/128-duplex-tcp-socket.t TEST 4 in CI
tzssangglass Sep 8, 2026
6967dca
fix flaky t/124-init-worker.t VM-close checks by matching log lines o…
tzssangglass Sep 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion t/024-access/on-abort.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ delete thread 1
$
--- timeout: 0.2
--- abort
--- wait: 0.2
--- wait: 1
--- ignore_response
--- no_error_log
[error]
Expand Down
106 changes: 51 additions & 55 deletions t/124-init-worker.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,24 +784,23 @@ ok
GET /t
--- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
--- grep_error_log_out eval
qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
lua close the global Lua VM \1
lua close the global Lua VM \1 in the cache helper process \d+
lua close the global Lua VM \1
|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
lua close the global Lua VM \2 in the cache helper process \d+
lua close the global Lua VM \2
lua close the global Lua VM \2
|lua close the global Lua VM ([0-9A-F]+)
lua close the global Lua VM \3 in the cache helper process \d+
lua close the global Lua VM \3
lua close the global Lua VM \3 in the cache helper process \d+
|lua close the global Lua VM ([0-9A-F]+)
lua close the global Lua VM \4 in the cache helper process \d+
lua close the global Lua VM \4 in the cache helper process \d+
lua close the global Lua VM \4
)(?:lua close the global Lua VM [0-9A-F]+
)*\z/
do {
my $close = qr/lua close the global Lua VM /;
my $helper = qr/${close}[0-9A-F]+ in the cache helper process \d+\n/;
my $plain = qr/${close}[0-9A-F]+\n/;
my $suffix = qr/ in the cache helper process \d+/;
my $skip = qr/(?:[^\n]*\n)*?/;

qr/
\A
(?= $skip $helper $skip $helper ) # at least 2 helper lines
(?! $skip $helper $skip $helper $skip $helper ) # but not a 3rd one
(?= $skip $plain $skip $plain ) # at least 2 plain lines
$close ([0-9A-F]+) (?:$suffix)? \n # 1st line pins the VM address
(?: $close \1 (?:$suffix)? \n )* # later lines: same address
\z
/x;
}
--- no_error_log
[error]
start privileged agent process
Expand Down Expand Up @@ -830,25 +829,23 @@ start privileged agent process
GET /t
--- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
--- grep_error_log_out eval
qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
lua close the global Lua VM \1
lua close the global Lua VM \1 in the cache helper process \d+
lua close the global Lua VM \1
|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
lua close the global Lua VM \2 in the cache helper process \d+
lua close the global Lua VM \2
lua close the global Lua VM \2
|lua close the global Lua VM ([0-9A-F]+)
lua close the global Lua VM \3 in the cache helper process \d+
lua close the global Lua VM \3
lua close the global Lua VM \3 in the cache helper process \d+
)(?:lua close the global Lua VM [0-9A-F]+
|lua close the global Lua VM ([0-9A-F]+)
lua close the global Lua VM \4 in the cache helper process \d+
lua close the global Lua VM \4 in the cache helper process \d+
lua close the global Lua VM \4
lua close the global Lua VM \4
)*\z/
do {
my $close = qr/lua close the global Lua VM /;
my $helper = qr/${close}[0-9A-F]+ in the cache helper process \d+\n/;
my $plain = qr/${close}[0-9A-F]+\n/;
my $suffix = qr/ in the cache helper process \d+/;
my $skip = qr/(?:[^\n]*\n)*?/;

qr/
\A
(?= $skip $helper $skip $helper ) # at least 2 helper lines
(?! $skip $helper $skip $helper $skip $helper ) # but not a 3rd one
(?= $skip $plain $skip $plain ) # at least 2 plain lines
$close ([0-9A-F]+) (?:$suffix)? \n # 1st line pins the VM address
(?: $close \1 (?:$suffix)? \n )* # later lines: same address
\z
/x;
}
--- no_error_log
[error]
start privileged agent process
Expand Down Expand Up @@ -878,24 +875,23 @@ start privileged agent process
GET /t
--- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
--- grep_error_log_out eval
qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
lua close the global Lua VM \1
lua close the global Lua VM \1 in the cache helper process \d+
lua close the global Lua VM \1
|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
lua close the global Lua VM \2 in the cache helper process \d+
lua close the global Lua VM \2
lua close the global Lua VM \2
|lua close the global Lua VM ([0-9A-F]+)
lua close the global Lua VM \3 in the cache helper process \d+
lua close the global Lua VM \3
lua close the global Lua VM \3 in the cache helper process \d+
|lua close the global Lua VM ([0-9A-F]+)
lua close the global Lua VM \4 in the cache helper process \d+
lua close the global Lua VM \4 in the cache helper process \d+
lua close the global Lua VM \4
)(?:lua close the global Lua VM [0-9A-F]+
)*\z/
do {
my $close = qr/lua close the global Lua VM /;
my $helper = qr/${close}[0-9A-F]+ in the cache helper process \d+\n/;
my $plain = qr/${close}[0-9A-F]+\n/;
my $suffix = qr/ in the cache helper process \d+/;
my $skip = qr/(?:[^\n]*\n)*?/;

qr/
\A
(?= $skip $helper $skip $helper ) # at least 2 helper lines
(?! $skip $helper $skip $helper $skip $helper ) # but not a 3rd one
(?= $skip $plain $skip $plain ) # at least 2 plain lines
$close ([0-9A-F]+) (?:$suffix)? \n # 1st line pins the VM address
(?: $close \1 (?:$suffix)? \n )* # later lines: same address
\z
/x;
}
--- error_log eval
qr/start privileged agent process \d+/
--- no_error_log
Expand Down
2 changes: 1 addition & 1 deletion t/128-duplex-tcp-socket.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) {
--- tcp_query_len: 11
--- no_error_log
[error]
--- wait: 0.05
--- wait: 0.5



Expand Down
3 changes: 3 additions & 0 deletions t/189-http2-subreq-error-wakeup.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ __DATA__
--- http2
--- request
GET /delay
--- curl_options: --max-time=0.9
--- timeout: 1
--- abort
--- ignore_response
Expand Down Expand Up @@ -100,6 +101,7 @@ Parent request finished, got response from subrequest
--- http2
--- request
GET /outer
--- curl_options: --max-time=0.9
--- timeout: 1
--- abort
--- ignore_response
Expand Down Expand Up @@ -160,6 +162,7 @@ Outer request completed
--- http2
--- request
GET /parallel
--- curl_options: --max-time=0.9
--- timeout: 1
--- abort
--- ignore_response
Expand Down
Loading