Skip to content

Commit 7da27f3

Browse files
author
Daniil Fedotov
committed
Update clustering management test to support transient rabbit app
1 parent 30864d2 commit 7da27f3

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

test/clustering_management_SUITE.erl

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ join_cluster_bad_operations(Config) ->
183183
ok = stop_app(Hare),
184184
assert_failure(fun () -> start_app(Hare) end),
185185
ok = start_app(Rabbit),
186-
ok = start_app(Hare),
186+
%% The Erlang VM has stopped after previous rabbit app failure
187+
ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
187188
ok.
188189

189190
%% This tests that the nodes in the cluster are notified immediately of a node
@@ -530,7 +531,9 @@ erlang_config(Config) ->
530531
assert_failure(fun () -> start_app(Hare) end),
531532
assert_not_clustered(Rabbit),
532533

533-
%% If we use an invalid node name, the node fails to start.
534+
%% If we use an invalid node type, the node fails to start.
535+
%% The Erlang VM has stopped after previous rabbit app failure
536+
ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
534537
ok = stop_app(Hare),
535538
ok = reset(Hare),
536539
ok = rpc:call(Hare, application, set_env,
@@ -539,6 +542,8 @@ erlang_config(Config) ->
539542
assert_not_clustered(Rabbit),
540543

541544
%% If we use an invalid node type, the node fails to start.
545+
%% The Erlang VM has stopped after previous rabbit app failure
546+
ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
542547
ok = stop_app(Hare),
543548
ok = reset(Hare),
544549
ok = rpc:call(Hare, application, set_env,
@@ -547,13 +552,17 @@ erlang_config(Config) ->
547552
assert_not_clustered(Rabbit),
548553

549554
%% If we use an invalid cluster_nodes conf, the node fails to start.
555+
%% The Erlang VM has stopped after previous rabbit app failure
556+
ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
550557
ok = stop_app(Hare),
551558
ok = reset(Hare),
552559
ok = rpc:call(Hare, application, set_env,
553560
[rabbit, cluster_nodes, true]),
554561
assert_failure(fun () -> start_app(Hare) end),
555562
assert_not_clustered(Rabbit),
556563

564+
%% The Erlang VM has stopped after previous rabbit app failure
565+
ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
557566
ok = stop_app(Hare),
558567
ok = reset(Hare),
559568
ok = rpc:call(Hare, application, set_env,
@@ -691,6 +700,8 @@ assert_failure(Fun) ->
691700
{error, Reason} -> Reason;
692701
{error_string, Reason} -> Reason;
693702
{badrpc, {'EXIT', Reason}} -> Reason;
703+
%% Failure to start an app result in node shutdown
704+
{badrpc, nodedown} -> nodedown;
694705
{badrpc_multi, Reason, _Nodes} -> Reason;
695706
Other -> exit({expected_failure, Other})
696707
end.

0 commit comments

Comments
 (0)