Skip to content

Commit 1234cbb

Browse files
the-mikedavisthe-mikedavis
committed
Respect RABBITMQ_METADATA_STORE in cases that fail mnesia mixed version tests
1 parent 74d1329 commit 1234cbb

File tree

5 files changed

+60
-39
lines changed

5 files changed

+60
-39
lines changed

‎deps/rabbit/test/cluster_minority_SUITE.erl

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,20 @@ suite() ->
5454
%% Testsuite setup/teardown.
5555
%% -------------------------------------------------------------------
5656

57-
init_per_suite(Config0) ->
57+
init_per_suite(Config) ->
5858
rabbit_ct_helpers:log_environment(),
59-
Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, khepri}]),
60-
rabbit_ct_helpers:run_setup_steps(Config,
61-
[
62-
fun rabbit_ct_broker_helpers:configure_dist_proxy/1
63-
]).
59+
case rabbit_ct_broker_helpers:configured_metadata_store(Config) of
60+
mnesia ->
61+
%% This SUITE is meant to test how Khepri behaves in a minority,
62+
%% so mnesia should be skipped.
63+
{skip, "Minority testing not supported by mnesia"};
64+
_ ->
65+
rabbit_ct_helpers:run_setup_steps(
66+
Config,
67+
[
68+
fun rabbit_ct_broker_helpers:configure_dist_proxy/1
69+
])
70+
end.
6471

6572
end_per_suite(Config) ->
6673
rabbit_ct_helpers:run_teardown_steps(Config).

‎deps/rabbit/test/clustering_management_SUITE.erl

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,20 @@ init_per_suite(Config) ->
129129
end_per_suite(Config) ->
130130
rabbit_ct_helpers:run_teardown_steps(Config).
131131

132-
init_per_group(mnesia_store, Config) ->
133-
rabbit_ct_helpers:set_config(Config, [{metadata_store, mnesia}]);
134132
init_per_group(khepri_store, Config) ->
135-
rabbit_ct_helpers:set_config(Config, [{metadata_store, khepri}]);
133+
case rabbit_ct_broker_helpers:configured_metadata_store(Config) of
134+
mnesia ->
135+
{skip, "These tests target Khepri"};
136+
_ ->
137+
Config
138+
end;
139+
init_per_group(mnesia_store, Config) ->
140+
case rabbit_ct_broker_helpers:configured_metadata_store(Config) of
141+
{khepri, _} ->
142+
{skip, "These tests target mnesia"};
143+
_ ->
144+
Config
145+
end;
136146
init_per_group(unclustered_2_nodes, Config) ->
137147
rabbit_ct_helpers:set_config(Config, [{rmq_nodes_clustered, false}]);
138148
init_per_group(unclustered_3_nodes, Config) ->

‎deps/rabbit/test/clustering_recovery_SUITE.erl

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,19 @@ end_per_suite(Config) ->
7272
rabbit_ct_helpers:run_teardown_steps(Config).
7373

7474
init_per_group(khepri_store, Config) ->
75-
rabbit_ct_helpers:set_config(Config, [{metadata_store, khepri}]);
75+
case rabbit_ct_broker_helpers:configured_metadata_store(Config) of
76+
mnesia ->
77+
{skip, "These tests target Khepri"};
78+
_ ->
79+
Config
80+
end;
7681
init_per_group(mnesia_store, Config) ->
77-
rabbit_ct_helpers:set_config(Config, [{metadata_store, mnesia}]);
82+
case rabbit_ct_broker_helpers:configured_metadata_store(Config) of
83+
{khepri, _} ->
84+
{skip, "These tests target mnesia"};
85+
_ ->
86+
Config
87+
end;
7888
init_per_group(clustered_3_nodes, Config) ->
7989
rabbit_ct_helpers:set_config(Config, [{rmq_nodes_clustered, true}]);
8090
init_per_group(clustered_5_nodes, Config) ->

‎deps/rabbit/test/metadata_store_clustering_SUITE.erl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,14 @@ cluster_size_3_tests() ->
5858

5959
init_per_suite(Config) ->
6060
rabbit_ct_helpers:log_environment(),
61-
rabbit_ct_helpers:run_setup_steps(Config, []).
61+
case rabbit_ct_helpers:is_mixed_versions() of
62+
true ->
63+
%% Khepri is not yet compatible with mixed version testing and this
64+
%% suite enables Khepri.
65+
{skip, "This suite does not yet support mixed version testing"};
66+
false ->
67+
rabbit_ct_helpers:run_setup_steps(Config, [])
68+
end.
6269

6370
end_per_suite(Config) ->
6471
rabbit_ct_helpers:run_teardown_steps(Config).

‎deps/rabbitmq_consistent_hash_exchange/test/rabbit_exchange_type_consistent_hash_SUITE.erl

Lines changed: 14 additions & 27 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,18 +98,12 @@ 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() ++
117104
rabbit_ct_broker_helpers:teardown_steps()).
118105

119-
init_per_testcase(Testcase, Config) ->
106+
init_per_testcase_common(Testcase, Config) ->
120107
clean_up_test_topology(Config),
121108
rabbit_ct_helpers:testcase_started(Config, Testcase).
122109

0 commit comments

Comments
 (0)