summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkjnilsson <knilsson@pivotal.io>2020-10-06 17:31:30 +0100
committerkjnilsson <knilsson@pivotal.io>2020-10-06 17:31:30 +0100
commit43293a8b1762016f724e9ee9062459a59f7208b3 (patch)
tree1f19537ccf89341d1ebf6940c17551d3055dcc29
parentdee6c8a1989f7cb42dd0123adb4588777262b175 (diff)
downloadrabbitmq-server-git-43293a8b1762016f724e9ee9062459a59f7208b3.tar.gz
queue_type_SUITE setup fix
-rw-r--r--test/queue_type_SUITE.erl28
1 files changed, 14 insertions, 14 deletions
diff --git a/test/queue_type_SUITE.erl b/test/queue_type_SUITE.erl
index eeeabc3d1e..b7d132e737 100644
--- a/test/queue_type_SUITE.erl
+++ b/test/queue_type_SUITE.erl
@@ -53,7 +53,6 @@ init_per_group(Group, Config) ->
Config2 = rabbit_ct_helpers:run_steps(Config1b,
[fun merge_app_env/1 ] ++
rabbit_ct_broker_helpers:setup_steps()),
- Config3 =
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, quorum_queue) of
ok ->
ok = rabbit_ct_broker_helpers:rpc(
@@ -61,22 +60,23 @@ init_per_group(Group, Config) ->
[rabbit, channel_tick_interval, 100]),
%% HACK: the larger cluster sizes benefit for a bit more time
%% after clustering before running the tests.
- case Group of
- cluster_size_5 ->
- timer:sleep(5000),
- Config2;
- _ ->
- Config2
- end;
+ Config3 = case Group of
+ cluster_size_5 ->
+ timer:sleep(5000),
+ Config2;
+ _ ->
+ Config2
+ end,
+
+ rabbit_ct_broker_helpers:set_policy(
+ Config3, 0,
+ <<"ha-policy">>, <<".*">>, <<"queues">>,
+ [{<<"ha-mode">>, <<"all">>}]),
+ Config3;
Skip ->
end_per_group(Group, Config2),
Skip
- end,
- rabbit_ct_broker_helpers:set_policy(
- Config3, 0,
- <<"ha-policy">>, <<".*">>, <<"queues">>,
- [{<<"ha-mode">>, <<"all">>}]),
- Config3.
+ end.
merge_app_env(Config) ->
rabbit_ct_helpers:merge_app_env(