diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2017-06-06 16:21:49 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2017-06-06 16:21:49 +0100 |
| commit | 5fad38ef9f86549c4b1a32d064bc307f8115aa1a (patch) | |
| tree | 192dfc6f73b7f281f4969653690b7667bd09693c /test | |
| parent | 2fda08f9e17440a965cb70037b892ac8e7edb2ff (diff) | |
| download | rabbitmq-server-git-5fad38ef9f86549c4b1a32d064bc307f8115aa1a.tar.gz | |
Update clustering management test to support new CLI output.
Already joined node message.
Changing disk node to disk should not fail
Diffstat (limited to 'test')
| -rw-r--r-- | test/clustering_management_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/clustering_management_SUITE.erl b/test/clustering_management_SUITE.erl index 66f6012216..51c0928ba5 100644 --- a/test/clustering_management_SUITE.erl +++ b/test/clustering_management_SUITE.erl @@ -135,7 +135,8 @@ join_and_part_cluster(Config) -> %% Allow clustering with already clustered node ok = stop_app(Rabbit), - ok = join_cluster(Rabbit, Hare), + {ok, <<"The node is already a member of this cluster">>} = + join_cluster(Rabbit, Hare), ok = start_app(Rabbit), stop_reset_start(Rabbit), @@ -388,10 +389,9 @@ force_boot(Config) -> change_cluster_node_type(Config) -> [Rabbit, Hare, _Bunny] = cluster_members(Config), - %% Trying to change the ram node when not clustered should always fail + %% Trying to change the node to the ram type when not clustered should always fail ok = stop_app(Rabbit), assert_failure(fun () -> change_cluster_node_type(Rabbit, ram) end), - assert_failure(fun () -> change_cluster_node_type(Rabbit, disc) end), ok = start_app(Rabbit), ok = stop_app(Rabbit), @@ -643,7 +643,7 @@ wait_for_pid_file_to_contain_running_process_pid(PidFile, Attempts, Timeout) -> Pid = pid_from_file(PidFile), case rabbit_misc:is_os_process_alive(Pid) of true -> ok; - false -> + false -> ct:sleep(Timeout), wait_for_pid_file_to_contain_running_process_pid(PidFile, Attempts - 1, Timeout) end. |