summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkjnilsson <knilsson@pivotal.io>2019-02-21 11:49:17 +0000
committerkjnilsson <knilsson@pivotal.io>2019-02-21 11:50:23 +0000
commitd256c78560a9d73fb39d7c159eedc00768a35dc2 (patch)
treeaf6e11ae0745ddeea16ec7009acd5c70c0d39ee6
parent14a09806440e06d7a7ff77551f68610d916c597a (diff)
downloadrabbitmq-server-git-d256c78560a9d73fb39d7c159eedc00768a35dc2.tar.gz
Handle mixed version clusters in test suite
-rw-r--r--test/rabbitmq_queues_cli_integration_SUITE.erl14
1 files changed, 10 insertions, 4 deletions
diff --git a/test/rabbitmq_queues_cli_integration_SUITE.erl b/test/rabbitmq_queues_cli_integration_SUITE.erl
index 1601ba82fe..b3e9515855 100644
--- a/test/rabbitmq_queues_cli_integration_SUITE.erl
+++ b/test/rabbitmq_queues_cli_integration_SUITE.erl
@@ -47,10 +47,16 @@ init_per_group(tests, Config0) ->
Config1 = rabbit_ct_helpers:set_config(
Config0, [{rmq_nodes_count, NumNodes},
{rmq_nodes_clustered, true}]),
- rabbit_ct_helpers:run_steps(Config1,
- rabbit_ct_broker_helpers:setup_steps() ++
- rabbit_ct_client_helpers:setup_steps()
- ).
+ Config2 = rabbit_ct_helpers:run_steps(Config1,
+ rabbit_ct_broker_helpers:setup_steps() ++
+ rabbit_ct_client_helpers:setup_steps()),
+ case rabbit_ct_broker_helpers:enable_feature_flag(Config2, quorum_queue) of
+ ok ->
+ Config2;
+ Skip ->
+ end_per_group(tests, Config2),
+ Skip
+ end.
end_per_group(tests, Config) ->
rabbit_ct_helpers:run_steps(Config,