Skip to content

Commit 4e1a9e1

Browse files
committed
tests: relaxed the checks to account for timing races in error logs from multiple cache helper processes.
1 parent 9279612 commit 4e1a9e1

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

t/124-init-worker.t

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -781,11 +781,15 @@ ok
781781
GET /t
782782
--- 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+$/
783783
--- grep_error_log_out eval
784-
qr/\Alua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
784+
qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
785785
lua close the global Lua VM \1
786786
lua close the global Lua VM \1 in the cache helper process \d+
787787
lua close the global Lua VM \1
788-
(?:lua close the global Lua VM [0-9A-F]+
788+
|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
789+
lua close the global Lua VM \2 in the cache helper process \d+
790+
lua close the global Lua VM \2
791+
lua close the global Lua VM \2
792+
)(?:lua close the global Lua VM [0-9A-F]+
789793
)*\z/
790794
--- no_error_log
791795
[error]
@@ -815,11 +819,15 @@ start privileged agent process
815819
GET /t
816820
--- 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+$/
817821
--- grep_error_log_out eval
818-
qr/\Alua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
822+
qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
819823
lua close the global Lua VM \1
820824
lua close the global Lua VM \1 in the cache helper process \d+
821825
lua close the global Lua VM \1
822-
(?:lua close the global Lua VM [0-9A-F]+
826+
|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
827+
lua close the global Lua VM \2 in the cache helper process \d+
828+
lua close the global Lua VM \2
829+
lua close the global Lua VM \2
830+
)(?:lua close the global Lua VM [0-9A-F]+
823831
)*\z/
824832
--- no_error_log
825833
[error]
@@ -850,11 +858,15 @@ start privileged agent process
850858
GET /t
851859
--- 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+$/
852860
--- grep_error_log_out eval
853-
qr/\Alua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
861+
qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
854862
lua close the global Lua VM \1
855863
lua close the global Lua VM \1 in the cache helper process \d+
856864
lua close the global Lua VM \1
857-
(?:lua close the global Lua VM [0-9A-F]+
865+
|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
866+
lua close the global Lua VM \2 in the cache helper process \d+
867+
lua close the global Lua VM \2
868+
lua close the global Lua VM \2
869+
)(?:lua close the global Lua VM [0-9A-F]+
858870
)*\z/
859871
--- error_log eval
860872
qr/start privileged agent process \d+/

0 commit comments

Comments
 (0)