Skip to content

Commit 8ffd3da

Browse files
committed
test helpers: use the correct rabbit_fifo version
1 parent e8ff042 commit 8ffd3da

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

deps/rabbitmq_ct_helpers/src/queue_utils.erl

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,27 @@
2121
-define(WFM_SLEEP, 256).
2222
-define(WFM_DEFAULT_NUMS, 30_000 div ?WFM_SLEEP). %% ~30s
2323

24+
rabbit_fifo_module([Server|_], Q) ->
25+
Overview = erpc:call(Server, ra, member_overview, [Q]),
26+
{ok, #{effective_machine_version := MacVer}, _} = Overview,
27+
rabbit_fifo:which_module(MacVer).
28+
2429
wait_for_messages_ready(Servers, QName, Ready) ->
30+
Mod = rabbit_fifo_module(Servers, QName),
2531
wait_for_messages(Servers, QName, Ready,
26-
fun rabbit_fifo:query_messages_ready/1,
32+
fun Mod:query_messages_ready/1,
2733
?WFM_DEFAULT_NUMS).
2834

2935
wait_for_messages_pending_ack(Servers, QName, Ready) ->
36+
Mod = rabbit_fifo_module(Servers, QName),
3037
wait_for_messages(Servers, QName, Ready,
31-
fun rabbit_fifo:query_messages_checked_out/1,
38+
fun Mod:query_messages_checked_out/1,
3239
?WFM_DEFAULT_NUMS).
3340

3441
wait_for_messages_total(Servers, QName, Total) ->
42+
Mod = rabbit_fifo_module(Servers, QName),
3543
wait_for_messages(Servers, QName, Total,
36-
fun rabbit_fifo:query_messages_total/1,
44+
fun Mod:query_messages_total/1,
3745
?WFM_DEFAULT_NUMS).
3846

3947
wait_for_messages(Servers, QName, Total, Fun) ->

0 commit comments

Comments
 (0)