fix flake

rabbitmq · Aug 15, 2024 · f9aa5ac · f9aa5ac
1 parent 8db9d83
commit f9aa5ac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
@@ -714,6 +714,7 @@ rabbitmq_suite(
         "@gen_batch_server//:erlang_app",
         "@meck//:erlang_app",
         "@ra//:erlang_app",
+        "//deps/rabbitmq_ct_helpers:erlang_app",
     ],
 )
 

diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl
@@ -1329,7 +1329,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/rabbit_fifo_int_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app"],
+        deps = ["//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "rabbit_fifo_prop_SUITE_beam_files",

diff --git a/deps/rabbit/test/rabbit_fifo_int_SUITE.erl b/deps/rabbit/test/rabbit_fifo_int_SUITE.erl
@@ -380,6 +380,16 @@ returns_after_down(Config) ->
     after 5000 ->
               ct:fail("waiting for process exit timed out")
     end,
+    rabbit_ct_helpers:await_condition(
+      fun () ->
+                case ra:member_overview(ServerId) of
+                    {ok, #{machine := #{num_consumers := 0}}, _} ->
+                        true;
+                    X ->
+                        ct:pal("X ~p", [X]),
+                        false
+                end
+      end),
     % message should be available for dequeue
     {ok, _, {_, _, _, _, Msg1Out}, _} =
         rabbit_fifo_client:dequeue(ClusterName, <<"tag">>, settled, F2),