summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorkjnilsson <knilsson@pivotal.io>2018-12-03 12:57:58 +0000
committerkjnilsson <knilsson@pivotal.io>2018-12-03 12:57:58 +0000
commit812706707f300b735f22a56b7ff713cd20f4c7b9 (patch)
treedab4762ada1a9fd7013660f636b69c8dae1cc557 /test
parentd675f6854356a330e6d6ab7f6c58376cd8971a91 (diff)
downloadrabbitmq-server-git-812706707f300b735f22a56b7ff713cd20f4c7b9.tar.gz
Optimise quorum_queue SUITE
By reducing net_ticktime in the suite and base the hardcoded queue.delete on net_ticktime.
Diffstat (limited to 'test')
-rw-r--r--test/quorum_queue_SUITE.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl
index cf12078034..26357c3fee 100644
--- a/test/quorum_queue_SUITE.erl
+++ b/test/quorum_queue_SUITE.erl
@@ -134,7 +134,7 @@ init_per_group(clustered, Config) ->
init_per_group(unclustered, Config) ->
rabbit_ct_helpers:set_config(Config, [{rmq_nodes_clustered, false}]);
init_per_group(clustered_with_partitions, Config) ->
- Config;
+ rabbit_ct_helpers:set_config(Config, [{net_ticktime, 10}]);
init_per_group(Group, Config) ->
ClusterSize = case Group of
single_node -> 1;
@@ -146,7 +146,8 @@ init_per_group(Group, Config) ->
[{rmq_nodes_count, ClusterSize},
{rmq_nodename_suffix, Group},
{tcp_ports_base}]),
- Config2 = rabbit_ct_helpers:run_steps(Config1,
+ Config1b = rabbit_ct_helpers:set_config(Config1, [{net_ticktime, 10}]),
+ Config2 = rabbit_ct_helpers:run_steps(Config1b,
[fun merge_app_env/1 ] ++
rabbit_ct_broker_helpers:setup_steps()),
ok = rabbit_ct_broker_helpers:rpc(
@@ -1667,6 +1668,7 @@ cleanup_data_dir(Config) ->
?assertExit({{shutdown,
{connection_closing, {server_initiated_close, 541, _}}}, _},
amqp_channel:call(Ch, #'queue.delete'{queue = QQ})),
+ catch amqp_channel:call(Ch, #'queue.delete'{queue = QQ}),
?assert(filelib:is_dir(DataDir)),
?assertEqual(ok,