From 3e5d61ddc3ee1bf2173a603142543045489da81b Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias@lshift.net>
Date: Tue, 14 Apr 2009 23:09:43 +0100
Subject: keep dialyzer happy - the spec for rabbit_misc:format_stderr/2 was
 wrong, - for rabbit_{control,multi}:start/0 we need to add a spec so we can  
 specify the no_return() caused by the calls to halt()

---
 src/rabbit_control.erl | 13 +++++++++++++
 src/rabbit_misc.erl    |  2 +-
 src/rabbit_multi.erl   | 11 +++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index cbc11b40..352d7e75 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -38,6 +38,19 @@
 
 -define(RPC_TIMEOUT, 30000).
 
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start/0 :: () -> no_return()).
+-spec(stop/0 :: () -> 'ok').
+-spec(action/4 :: (atom(), erlang_node(), [string()],
+                   fun ((string(), [any()]) -> 'ok')) -> 'ok').
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
 start() ->
     FullCommand = init:get_plain_arguments(),
     #params{quiet = Quiet, node = Node, command = Command, args = Args} = 
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index b15ad68e..1fcd9a61 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -105,7 +105,7 @@
 -spec(dirty_dump_log/1 :: (string()) -> 'ok' | {'error', any()}).
 -spec(append_file/2 :: (string(), string()) -> 'ok' | {'error', any()}).
 -spec(ensure_parent_dirs_exist/1 :: (string()) -> 'ok').
--spec(format_stderr/2 :: (string(), [any()]) -> 'true').
+-spec(format_stderr/2 :: (string(), [any()]) -> 'ok').
 
 -endif.
 
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index 5e8edd53..d9197535 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -36,6 +36,17 @@
 
 -define(RPC_SLEEP, 500).
 
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start/0 :: () -> no_return()).
+-spec(stop/0 :: () -> 'ok').
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
 start() ->
     RpcTimeout =
         case init:get_argument(maxwait) of
-- 
cgit v1.2.1


From a86da414a8a26d1235b3c167224281cf22f6a92a Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias@lshift.net>
Date: Wed, 15 Apr 2009 12:44:38 +0100
Subject: leave system in clustered state ...when testing clustering. That
 allows other tests of clustering-related features to commence subsequently.

---
 src/rabbit_tests.erl | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index df2e71d9..6706ecd1 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.
 
-- 
cgit v1.2.1