summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-08-22 18:08:57 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-08-22 18:08:57 +0100
commit7ea4a859f8ee4d83bab74d1c0dd583a8f8ff176a (patch)
tree9ef68bfab6623a1712ed3c9285a647a0cc1a833a
parent38a2d007572eddce69ff237bf3649288042fa44b (diff)
downloadrabbitmq-server-7ea4a859f8ee4d83bab74d1c0dd583a8f8ff176a.tar.gz
Fix tests, at the cost of a leetle tiny bit of ugliness.
-rw-r--r--src/rabbit_tests.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index cd5d9be0..0d4e1f0f 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1114,7 +1114,13 @@ test_cluster_management2(SecondaryNode) ->
%% 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, [], []),
+ %% Yes, this is rather ugly. But since we're a clustered Mnesia
+ %% node and we're telling another clustered node to reset itself,
+ %% we will get disconnected half way through causing a
+ %% badrpc. This never happens in real life since rabbitmqctl is
+ %% not a clustered Mnesia node.
+ {badrpc, nodedown} = control_action(force_reset, SecondaryNode, [], []),
+ pong = net_adm:ping(SecondaryNode),
ok = control_action(cluster, SecondaryNode, [NodeS], []),
ok = control_action(start_app, SecondaryNode, [], []),