Skip to content

Commit 3887256

Browse files
authored
Merge pull request #13323 from rabbitmq/adapt-clustering_management_SUITE-to-khepri-0.17.0
clustering_management_SUITE: Use old node as seed node
2 parents d2576dd + f088c4f commit 3887256

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

deps/rabbit/test/clustering_management_SUITE.erl

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ groups() ->
7676
status_with_alarm,
7777
pid_file_and_await_node_startup_in_khepri,
7878
await_running_count_in_khepri,
79-
start_with_invalid_schema_in_path,
8079
persistent_cluster_id,
8180
stop_start_cluster_node,
8281
restart_cluster_node,
@@ -337,7 +336,7 @@ restart_cluster_node(Config) ->
337336
assert_clustered([Rabbit, Hare]).
338337

339338
join_and_part_cluster_in_khepri(Config) ->
340-
[Rabbit, Hare, Bunny] = cluster_members(Config),
339+
[Rabbit, Bunny, Hare] = cluster_members(Config),
341340
assert_not_clustered(Rabbit),
342341
assert_not_clustered(Hare),
343342
assert_not_clustered(Bunny),
@@ -447,38 +446,38 @@ join_to_start_interval(Config) ->
447446
assert_clustered([Rabbit, Hare]).
448447

449448
join_cluster_in_minority(Config) ->
450-
[Rabbit, Hare, Bunny] = cluster_members(Config),
449+
[Rabbit, Bunny, Hare] = cluster_members(Config),
451450
assert_not_clustered(Rabbit),
452451
assert_not_clustered(Hare),
453452
assert_not_clustered(Bunny),
454453

455-
stop_join_start(Config, Bunny, Rabbit),
454+
stop_join_start(Config, Rabbit, Bunny),
456455
assert_clustered([Rabbit, Bunny]),
457-
ok = rabbit_ct_broker_helpers:stop_node(Config, Bunny),
456+
ok = rabbit_ct_broker_helpers:stop_node(Config, Rabbit),
458457

459458
ok = stop_app(Config, Hare),
460-
?assertEqual(ok, join_cluster(Config, Hare, Rabbit, false)),
459+
?assertEqual(ok, join_cluster(Config, Hare, Bunny, false)),
461460

462-
ok = rabbit_ct_broker_helpers:start_node(Config, Bunny),
461+
ok = rabbit_ct_broker_helpers:start_node(Config, Rabbit),
463462
?assertEqual(ok, join_cluster(Config, Hare, Rabbit, false)),
464463
?assertEqual(ok, start_app(Config, Hare)),
465464

466465
assert_clustered([Rabbit, Bunny, Hare]).
467466

468467
join_cluster_with_rabbit_stopped(Config) ->
469-
[Rabbit, Hare, Bunny] = cluster_members(Config),
468+
[Rabbit, Bunny, Hare] = cluster_members(Config),
470469
assert_not_clustered(Rabbit),
471470
assert_not_clustered(Hare),
472471
assert_not_clustered(Bunny),
473472

474-
stop_join_start(Config, Bunny, Rabbit),
473+
stop_join_start(Config, Rabbit, Bunny),
475474
assert_clustered([Rabbit, Bunny]),
476-
ok = stop_app(Config, Bunny),
475+
ok = stop_app(Config, Rabbit),
477476

478477
ok = stop_app(Config, Hare),
479-
?assertEqual(ok, join_cluster(Config, Hare, Rabbit, false)),
478+
?assertEqual(ok, join_cluster(Config, Hare, Bunny, false)),
480479

481-
ok = start_app(Config, Bunny),
480+
ok = start_app(Config, Rabbit),
482481
?assertEqual(ok, join_cluster(Config, Hare, Rabbit, false)),
483482
?assertEqual(ok, start_app(Config, Hare)),
484483

@@ -1119,7 +1118,7 @@ await_running_count_in_khepri(Config) ->
11191118
await_running_count, [5, 1000])).
11201119

11211120
start_nodes_in_reverse_order(Config) ->
1122-
[Rabbit, Hare, Bunny] = cluster_members(Config),
1121+
[Rabbit, Bunny, Hare] = cluster_members(Config),
11231122
assert_not_clustered(Rabbit),
11241123
assert_not_clustered(Hare),
11251124
assert_not_clustered(Bunny),
@@ -1142,7 +1141,7 @@ start_nodes_in_reverse_order(Config) ->
11421141

11431142
%% Test booting nodes in the wrong order for Mnesia. Interesting...
11441143
start_nodes_in_stop_order(Config) ->
1145-
[Rabbit, Hare, Bunny] = cluster_members(Config),
1144+
[Rabbit, Bunny, Hare] = cluster_members(Config),
11461145
assert_not_clustered(Rabbit),
11471146
assert_not_clustered(Hare),
11481147
assert_not_clustered(Bunny),
@@ -1167,7 +1166,7 @@ start_nodes_in_stop_order(Config) ->
11671166
end.
11681167

11691168
start_nodes_in_stop_order_in_khepri(Config) ->
1170-
[Rabbit, Hare, Bunny] = cluster_members(Config),
1169+
[Rabbit, Bunny, Hare] = cluster_members(Config),
11711170
assert_not_clustered(Rabbit),
11721171
assert_not_clustered(Hare),
11731172
assert_not_clustered(Bunny),
@@ -1190,7 +1189,7 @@ start_nodes_in_stop_order_in_khepri(Config) ->
11901189

11911190
%% TODO test force_boot with Khepri involved
11921191
start_nodes_in_stop_order_with_force_boot(Config) ->
1193-
[Rabbit, Hare, Bunny] = cluster_members(Config),
1192+
[Rabbit, Bunny, Hare] = cluster_members(Config),
11941193
assert_not_clustered(Rabbit),
11951194
assert_not_clustered(Hare),
11961195
assert_not_clustered(Bunny),

0 commit comments

Comments
 (0)