summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-04-16 10:58:04 +0100
committerMatthew Sackman <matthew@lshift.net>2009-04-16 10:58:04 +0100
commit71d2ec0691eacf99a274881aaf50d3ba93f0d80a (patch)
tree1ac588e3c26e0329905a2579940fb424c64b19e8 /src
parentdd689096cfce851239646df70aaf1f22decd4d55 (diff)
parentdd07646f40a2ecdcd3637c08efb884dc563d580f (diff)
downloadrabbitmq-server-git-71d2ec0691eacf99a274881aaf50d3ba93f0d80a.tar.gz
merge bug20599 into v1_5
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_tests.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index df2e71d9e6..6706ecd1fc 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -430,7 +430,13 @@ test_cluster_management2(SecondaryNode) ->
ok = control_action(stop_app, []),
{error, {no_running_cluster_nodes, _, _}} =
control_action(reset, []),
+
+ %% leave system clustered, with the secondary node as a ram node
ok = control_action(force_reset, []),
+ ok = control_action(start_app, []),
+ ok = control_action(force_reset, SecondaryNode, []),
+ ok = control_action(cluster, SecondaryNode, [NodeS]),
+ ok = control_action(start_app, SecondaryNode, []),
passed.