Skip to content

Commit 274ef7d

Browse files
committed
rabbit_fifo_dlx_integration_SUITE: Wait for conditions with awaitMatch()
[Why] Hopefully, this fixes some test flakes in CI.
1 parent eab6573 commit 274ef7d

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

deps/rabbit/test/rabbit_fifo_dlx_integration_SUITE.erl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,12 @@ end_per_testcase(Testcase, Config) ->
158158
delete_queue(Ch, ?config(target_queue_6, Config)),
159159
#'exchange.delete_ok'{} = amqp_channel:call(Ch, #'exchange.delete'{exchange = ?config(dead_letter_exchange, Config)}),
160160

161-
DlxWorkers = rabbit_ct_broker_helpers:rpc_all(Config, supervisor, which_children, [rabbit_fifo_dlx_sup]),
162-
?assert(lists:all(fun(L) -> L =:= [] end, DlxWorkers)),
161+
?awaitMatch(
162+
true,
163+
begin
164+
DlxWorkers = rabbit_ct_broker_helpers:rpc_all(Config, supervisor, which_children, [rabbit_fifo_dlx_sup]),
165+
lists:all(fun(L) -> L =:= [] end, DlxWorkers)
166+
end, 60000),
163167

164168
Config1 = rabbit_ct_helpers:run_steps(
165169
Config,
@@ -960,7 +964,7 @@ single_dlx_worker(Config) ->
960964
assert_active_dlx_workers(1, Config, Leader1).
961965

962966
assert_active_dlx_workers(N, Config, Server) ->
963-
?assertEqual(N, length(rpc(Config, Server, supervisor, which_children, [rabbit_fifo_dlx_sup], 2000))).
967+
?awaitMatch(N, length(rpc(Config, Server, supervisor, which_children, [rabbit_fifo_dlx_sup], 2000)), 60000).
964968

965969
declare_queue(Channel, Queue, Args) ->
966970
#'queue.declare_ok'{} = amqp_channel:call(Channel, #'queue.declare'{

0 commit comments

Comments
 (0)