summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-04-02 17:25:14 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-04-02 17:25:14 +0100
commit25c3b0e3f44b11fef3060feca9189648cd14fcf6 (patch)
tree0c7480b4414a7e3888a25b310a4cbd6a8d2a3a20
parentb46957894bcdcebab47f45ed4ddc8d6faa08f948 (diff)
downloadrabbitmq-server-bug24842.tar.gz
fix cluster tests to work again in single-node casebug24842
-rw-r--r--src/rabbit_tests.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 55e4a6f8..9cb830e9 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -883,6 +883,8 @@ test_cluster_management() ->
"invalid2@invalid"]),
ok = assert_ram_node(),
+ ok = control_action(reset, []),
+
SecondaryNode = rabbit_nodes:make("hare"),
case net_adm:ping(SecondaryNode) of
pong -> passed = test_cluster_management2(SecondaryNode);
@@ -898,7 +900,6 @@ test_cluster_management2(SecondaryNode) ->
SecondaryNodeS = atom_to_list(SecondaryNode),
%% make a disk node
- ok = control_action(reset, []),
ok = control_action(cluster, [NodeS]),
ok = assert_disc_node(),
%% make a ram node