summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2020-11-03 13:57:45 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2020-11-04 10:37:59 +0100
commit11824c5989e22c53fd3b9481beb2dbc62f9e801e (patch)
tree5b0788d944c37c35925b4caa6ab779a71d099f01
parent5a15c6c520b035ad2fada10d5af147c31e0102da (diff)
downloadrabbitmq-server-git-11824c5989e22c53fd3b9481beb2dbc62f9e801e.tar.gz
quorum_queue_SUITE: Delete `restart_queue` queue
... at the end of the `restart_queue` test case. Otherwise, I beleive that left-over state could affect negatively other test cases. One of them being the `restart_all_types` which also look at the supervisor children. (cherry picked from commit 24211db427ec928da56f1db820a2bfece6805739)
-rw-r--r--test/quorum_queue_SUITE.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl
index 2a306dc90f..36a6d41a61 100644
--- a/test/quorum_queue_SUITE.erl
+++ b/test/quorum_queue_SUITE.erl
@@ -482,7 +482,9 @@ restart_queue(Config) ->
rpc:call(Server, application, which_applications, []))),
Expected = Children + 1,
?assertMatch(Expected,
- length(rpc:call(Server, supervisor, which_children, [ra_server_sup_sup]))).
+ length(rpc:call(Server, supervisor, which_children, [ra_server_sup_sup]))),
+ Ch2 = rabbit_ct_client_helpers:open_channel(Config, Server),
+ delete_queues(Ch2, [LQ]).
idempotent_recover(Config) ->
Server = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
@@ -586,7 +588,8 @@ restart_all_types(Config) ->
delete_queues(Ch2, [QQ1, QQ2, CQ1, CQ2]).
delete_queues(Ch, Queues) ->
- [amqp_channel:call(Ch, #'queue.delete'{queue = Q}) || Q <- Queues].
+ [amqp_channel:call(Ch, #'queue.delete'{queue = Q}) || Q <- Queues],
+ ok.
stop_start_rabbit_app(Config) ->
%% Test start/stop of rabbit app with both types of queues (quorum and