summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2017-10-27 19:39:18 +0100
committerDaniil Fedotov <dfedotov@pivotal.io>2017-10-27 19:39:18 +0100
commit32c48cd7636885f27c24c60e648fd911ff8acd31 (patch)
tree03af2de8d0a4273413f48acaab261a5c8a343522 /test
parent21879a91b19b4c959d7b66d73a31b638cb4f4dcf (diff)
parent7da27f3d3b80beddc1ac503c388df78972153ea0 (diff)
downloadrabbitmq-server-git-32c48cd7636885f27c24c60e648fd911ff8acd31.tar.gz
Merge branch 'stable'
Diffstat (limited to 'test')
-rw-r--r--test/clustering_management_SUITE.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/clustering_management_SUITE.erl b/test/clustering_management_SUITE.erl
index 2a23c4997e..0bc1e4dea4 100644
--- a/test/clustering_management_SUITE.erl
+++ b/test/clustering_management_SUITE.erl
@@ -532,7 +532,9 @@ erlang_config(Config) ->
ok = start_app(Hare),
assert_clustered([Rabbit, Hare]),
- %% 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,
@@ -703,6 +705,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.