summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2010-07-06 15:59:02 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2010-07-06 15:59:02 +0100
commit5c6a8fcd40c6b98b442a89b08bdae9cded613e71 (patch)
tree62bce5f1f722d7494f3872002e55b0788fe1b4ff
parent4499f68aac947ee86aad7727f8c8835101b64222 (diff)
downloadrabbitmq-server-5c6a8fcd40c6b98b442a89b08bdae9cded613e71.tar.gz
all tests now pass
-rw-r--r--src/rabbit_tests.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index e0147207..842e9f61 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -663,18 +663,18 @@ test_cluster_management2(SecondaryNode) ->
%% join cluster as a ram node
ok = control_action(reset, []),
- ok = control_action(cluster, [SecondaryNodeS, "invalid1@invalid"]),
+ ok = control_action(force_cluster, [SecondaryNodeS, "invalid1@invalid"]),
ok = control_action(start_app, []),
ok = control_action(stop_app, []),
%% change cluster config while remaining in same cluster
- ok = control_action(cluster, ["invalid2@invalid", SecondaryNodeS]),
+ ok = control_action(force_cluster, ["invalid2@invalid", SecondaryNodeS]),
ok = control_action(start_app, []),
ok = control_action(stop_app, []),
%% join non-existing cluster as a ram node
- ok = control_action(cluster, ["invalid1@invalid",
- "invalid2@invalid"]),
+ ok = control_action(force_cluster, ["invalid1@invalid",
+ "invalid2@invalid"]),
%% turn ram node into disk node
ok = control_action(reset, []),
ok = control_action(cluster, [SecondaryNodeS, NodeS]),
@@ -682,8 +682,8 @@ test_cluster_management2(SecondaryNode) ->
ok = control_action(stop_app, []),
%% convert a disk node into a ram node
- ok = control_action(cluster, ["invalid1@invalid",
- "invalid2@invalid"]),
+ ok = control_action(force_cluster, ["invalid1@invalid",
+ "invalid2@invalid"]),
%% turn a disk node into a ram node
ok = control_action(reset, []),