Skip to content

Commit da83358

Browse files
committed
Respect RABBITMQ_METADATA_STORE in consistent hash exchange suite
1 parent 0a4e5a9 commit da83358

File tree

1 file changed

+13
-26
lines changed

1 file changed

+13
-26
lines changed

deps/rabbitmq_consistent_hash_exchange/test/rabbit_exchange_type_consistent_hash_SUITE.erl

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,17 @@
2020

2121
all() ->
2222
[
23-
{group, mnesia_store},
24-
{group, khepri_store},
23+
{group, routing_tests},
24+
{group, hash_ring_management_tests},
25+
{group, clustered},
2526
{group, khepri_migration}
2627
].
2728

2829
groups() ->
2930
[
30-
{mnesia_store, [], [
31-
{routing_tests, [], routing_tests()},
32-
{hash_ring_management_tests, [], hash_ring_management_tests()},
33-
{clustered, [], [node_restart]}
34-
]},
35-
{khepri_store, [], [
36-
{routing_tests, [], routing_tests()},
37-
{hash_ring_management_tests, [], hash_ring_management_tests()},
38-
{clustered, [], [node_restart]}
39-
]},
31+
{routing_tests, [], routing_tests()},
32+
{hash_ring_management_tests, [], hash_ring_management_tests()},
33+
{clustered, [], [node_restart]},
4034
{khepri_migration, [], [
4135
from_mnesia_to_khepri
4236
]}
@@ -82,14 +76,13 @@ init_per_suite(Config) ->
8276
end_per_suite(Config) ->
8377
rabbit_ct_helpers:run_teardown_steps(Config).
8478

85-
init_per_group(mnesia_store, Config) ->
86-
rabbit_ct_helpers:set_config(Config, [{metadata_store, mnesia}]);
87-
init_per_group(khepri_store, Config) ->
88-
FFs = [khepri_db],
89-
rabbit_ct_helpers:set_config(Config, [{metadata_store, {khepri, FFs}}]);
90-
init_per_group(khepri_migration = Group, Config0) ->
91-
Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, mnesia}]),
92-
init_per_group(Group, Config, 1);
79+
init_per_group(khepri_migration = Group, Config) ->
80+
case rabbit_ct_broker_helpers:configured_metadata_store(Config) of
81+
mnesia ->
82+
init_per_group(Group, Config, 1);
83+
_ ->
84+
{skip, "This group only targets mnesia"}
85+
end;
9386
init_per_group(clustered = Group, Config) ->
9487
init_per_group(Group, Config, 3);
9588
init_per_group(Group, Config) ->
@@ -105,12 +98,6 @@ init_per_group(Group, Config, NodesCount) ->
10598
rabbit_ct_broker_helpers:setup_steps() ++
10699
rabbit_ct_client_helpers:setup_steps()).
107100

108-
end_per_group(mnesia_store, Config) ->
109-
Config;
110-
end_per_group(khepri_store, Config) ->
111-
Config;
112-
end_per_group(khepri_migration, Config) ->
113-
Config;
114101
end_per_group(_, Config) ->
115102
rabbit_ct_helpers:run_teardown_steps(Config,
116103
rabbit_ct_client_helpers:teardown_steps() ++

0 commit comments

Comments
 (0)