summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2017-10-27 18:00:50 +0100
committerDaniil Fedotov <dfedotov@pivotal.io>2017-10-27 18:00:50 +0100
commit7da27f3d3b80beddc1ac503c388df78972153ea0 (patch)
tree51e08cb905f21b6766c429be5d0c033ecbd6f92b /test
parent30864d2a57a4d475eef672885c509c28301165fe (diff)
downloadrabbitmq-server-git-7da27f3d3b80beddc1ac503c388df78972153ea0.tar.gz
Update clustering management test to support transient rabbit app
Diffstat (limited to 'test')
-rw-r--r--test/clustering_management_SUITE.erl15
1 files changed, 13 insertions, 2 deletions
diff --git a/test/clustering_management_SUITE.erl b/test/clustering_management_SUITE.erl
index 7e70ab9495..95c1b6e65e 100644
--- a/test/clustering_management_SUITE.erl
+++ b/test/clustering_management_SUITE.erl
@@ -183,7 +183,8 @@ join_cluster_bad_operations(Config) ->
ok = stop_app(Hare),
assert_failure(fun () -> start_app(Hare) end),
ok = start_app(Rabbit),
- ok = start_app(Hare),
+ %% The Erlang VM has stopped after previous rabbit app failure
+ ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
ok.
%% This tests that the nodes in the cluster are notified immediately of a node
@@ -530,7 +531,9 @@ erlang_config(Config) ->
assert_failure(fun () -> start_app(Hare) end),
assert_not_clustered(Rabbit),
- %% If we use an invalid node name, the node fails to start.
+ %% If we use an invalid node type, the node fails to start.
+ %% The Erlang VM has stopped after previous rabbit app failure
+ ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
ok = stop_app(Hare),
ok = reset(Hare),
ok = rpc:call(Hare, application, set_env,
@@ -539,6 +542,8 @@ erlang_config(Config) ->
assert_not_clustered(Rabbit),
%% If we use an invalid node type, the node fails to start.
+ %% The Erlang VM has stopped after previous rabbit app failure
+ ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
ok = stop_app(Hare),
ok = reset(Hare),
ok = rpc:call(Hare, application, set_env,
@@ -547,6 +552,8 @@ erlang_config(Config) ->
assert_not_clustered(Rabbit),
%% If we use an invalid cluster_nodes conf, the node fails to start.
+ %% The Erlang VM has stopped after previous rabbit app failure
+ ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
ok = stop_app(Hare),
ok = reset(Hare),
ok = rpc:call(Hare, application, set_env,
@@ -554,6 +561,8 @@ erlang_config(Config) ->
assert_failure(fun () -> start_app(Hare) end),
assert_not_clustered(Rabbit),
+ %% The Erlang VM has stopped after previous rabbit app failure
+ ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
ok = stop_app(Hare),
ok = reset(Hare),
ok = rpc:call(Hare, application, set_env,
@@ -691,6 +700,8 @@ assert_failure(Fun) ->
{error, Reason} -> Reason;
{error_string, Reason} -> Reason;
{badrpc, {'EXIT', Reason}} -> Reason;
+ %% Failure to start an app result in node shutdown
+ {badrpc, nodedown} -> nodedown;
{badrpc_multi, Reason, _Nodes} -> Reason;
Other -> exit({expected_failure, Other})
end.