Skip to content

Commit cb5c41c

Browse files
Skip default_queue_type_group_tests in mixed version clusters
1 parent fb44100 commit cb5c41c

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

deps/rabbitmq_management/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ rabbitmq_integration_suite(
167167
additional_beam = [
168168
"test/rabbit_mgmt_runtime_parameters_util.beam",
169169
],
170-
shard_count = 6,
170+
shard_count = 7,
171171
runtime_deps = [
172172
"//deps/amqp10_client:erlang_app",
173173
],

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

+17-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ all_tests() -> [
211211
disabled_qq_replica_opers_test,
212212
qq_status_test,
213213
list_deprecated_features_test,
214-
list_used_deprecated_features_test,
214+
list_used_deprecated_features_test,
215215
cluster_and_node_tags_test,
216216
version_test
217217
].
@@ -256,11 +256,19 @@ init_per_suite(Config) ->
256256
end_per_suite(Config) ->
257257
Config.
258258

259-
init_per_group(all_tests_with_prefix=Group, Config0) ->
259+
init_per_group(Group, Config0) when Group == all_tests_with_prefix ->
260260
PathConfig = {rabbitmq_management, [{path_prefix, ?PATH_PREFIX}]},
261261
Config1 = rabbit_ct_helpers:merge_app_env(Config0, PathConfig),
262262
Config2 = finish_init(Group, Config1),
263263
start_broker(Config2);
264+
init_per_group(Group, Config0) when Group == default_queue_type_group_tests ->
265+
case rabbit_ct_helpers:is_mixed_versions() of
266+
true ->
267+
{skip, "not mixed versions compatible"};
268+
_ ->
269+
Config1 = finish_init(Group, Config0),
270+
start_broker(Config1)
271+
end;
264272
init_per_group(Group, Config0) ->
265273
Config1 = finish_init(Group, Config0),
266274
start_broker(Config1).
@@ -309,6 +317,13 @@ init_per_testcase(queues_detailed_test, Config) ->
309317
true -> Config;
310318
false -> {skip, "The detailed queues endpoint is not available."}
311319
end;
320+
init_per_testcase(Testcase, Config) when Testcase == definitions_file_metadata_test ->
321+
case rabbit_ct_helpers:is_mixed_versions() of
322+
true ->
323+
{skip, "not mixed versions compatible"};
324+
_ ->
325+
rabbit_ct_helpers:testcase_started(Config, Testcase)
326+
end;
312327
init_per_testcase(Testcase, Config) ->
313328
rabbit_ct_broker_helpers:close_all_connections(Config, 0, <<"rabbit_mgmt_SUITE:init_per_testcase">>),
314329
rabbit_ct_helpers:testcase_started(Config, Testcase).

0 commit comments

Comments
 (0)