diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2017-04-18 10:28:53 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2017-04-18 10:28:53 +0100 |
| commit | 79fa87f762c299ec5f023012501843a2821cfb49 (patch) | |
| tree | 9f1976f23bba3187e20df46956f76851cf193d27 | |
| parent | e0336d9abb93c22361c40f5452c908d5da1c5c5a (diff) | |
| download | rabbitmq-server-git-79fa87f762c299ec5f023012501843a2821cfb49.tar.gz | |
Shutdown cannot fail
| -rw-r--r-- | test/rabbitmqctl_shutdown_SUITE.erl | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/test/rabbitmqctl_shutdown_SUITE.erl b/test/rabbitmqctl_shutdown_SUITE.erl index fa04dc6504..25cc2fdef8 100644 --- a/test/rabbitmqctl_shutdown_SUITE.erl +++ b/test/rabbitmqctl_shutdown_SUITE.erl @@ -29,8 +29,7 @@ all() -> groups() -> [ {running_node, [], [ - successful_shutdown, - error_during_shutdown + successful_shutdown ]}, {non_running_node, [], [ nothing_to_shutdown @@ -91,16 +90,6 @@ successful_shutdown(Config) -> false = erlang_pid_is_running(Pid), false = node_is_running(Node). -error_during_shutdown(Config) -> - Node = ?config(node, Config), - ok = rabbit_ct_broker_helpers:control_action(stop_app, Node, []), - ok = rpc:call(Node, application, unload, [os_mon]), - - {badrpc, - {'EXIT', { - {error, {badmatch, {error,{edge,{bad_vertex,os_mon},os_mon,rabbit}}}}, - _}}} = shutdown_error(Node). - nothing_to_shutdown(Config) -> Node = ?config(node, Config), @@ -119,14 +108,6 @@ erlang_pid_is_running(Pid) -> node_is_running(Node) -> net_adm:ping(Node) == pong. -shutdown_error(Node) -> - %% Start a command - {stream, Stream} = rabbit_ct_broker_helpers:control_action(shutdown, Node, []), - %% Execute command steps. The last one should be error - Lines = 'Elixir.Enum':to_list(Stream), - {error, Err} = lists:last(Lines), - Err. - shutdown_ok(Node) -> %% Start a command {stream, Stream} = rabbit_ct_broker_helpers:control_action(shutdown, Node, []), |