diff options
| author | Diana Corbacho <diana@rabbitmq.com> | 2019-01-09 07:44:15 +0000 |
|---|---|---|
| committer | Diana Corbacho <diana@rabbitmq.com> | 2019-01-09 07:44:15 +0000 |
| commit | 0a254da651d6ff34b5ef35daf14cb31e0dafda88 (patch) | |
| tree | f364132c02426b0c8b49e7273dcbf006774acf57 /test | |
| parent | f96f38cec5e6a69428625ab9872e093f1365ae94 (diff) | |
| download | rabbitmq-server-git-0a254da651d6ff34b5ef35daf14cb31e0dafda88.tar.gz | |
Refactor quorum_queue_SUITE for dynamic_qq_SUITE
Forgotten in previous commits
Diffstat (limited to 'test')
| -rw-r--r-- | test/quorum_queue_SUITE.erl | 51 |
1 files changed, 5 insertions, 46 deletions
diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl index ee73d1ed7b..bfb9eeec12 100644 --- a/test/quorum_queue_SUITE.erl +++ b/test/quorum_queue_SUITE.erl @@ -20,6 +20,11 @@ -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). +-import(quorum_queue_utils, [wait_for_messages_ready/3, + wait_for_messages_pending_ack/3, + dirty_query/3, + ra_name/1]). + -compile(export_all). all() -> @@ -597,9 +602,6 @@ publish_confirm(Ch, QName) -> ct:pal("CONFIRMED! ~s", [QName]), ok. -ra_name(Q) -> - binary_to_atom(<<"%2F_", Q/binary>>, utf8). - publish_and_restart(Config) -> %% Test the node restart with both types of queues (quorum and classic) to %% ensure there are no regressions @@ -2245,49 +2247,6 @@ wait_for_cleanup(Server, Channel, Number, N) -> wait_for_cleanup(Server, Channel, Number, N - 1) end. - -wait_for_messages_ready(Servers, QName, Ready) -> - wait_for_messages(Servers, QName, Ready, - fun rabbit_fifo:query_messages_ready/1, 60). - -wait_for_messages_pending_ack(Servers, QName, Ready) -> - wait_for_messages(Servers, QName, Ready, - fun rabbit_fifo:query_messages_checked_out/1, 60). - -wait_for_messages(Servers, QName, Number, Fun, 0) -> - Msgs = dirty_query(Servers, QName, Fun), - Totals = lists:map(fun(M) when is_map(M) -> - maps:size(M); - (_) -> - -1 - end, Msgs), - ?assertEqual(Totals, [Number || _ <- lists:seq(1, length(Servers))]); -wait_for_messages(Servers, QName, Number, Fun, N) -> - Msgs = dirty_query(Servers, QName, Fun), - case lists:all(fun(M) when is_map(M) -> - maps:size(M) == Number; - (_) -> - false - end, Msgs) of - true -> - ok; - _ -> - timer:sleep(500), - wait_for_messages(Servers, QName, Number, Fun, N - 1) - end. - -dirty_query(Servers, QName, Fun) -> - lists:map( - fun(N) -> - case rpc:call(N, ra, local_query, [{QName, N}, Fun]) of - {ok, {_, Msgs}, _} -> - ct:pal("Msgs ~w", [Msgs]), - Msgs; - _ -> - undefined - end - end, Servers). - wait_until(Condition) -> wait_until(Condition, 60). |