diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-22 14:49:18 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-22 14:49:18 +0100 |
| commit | 0a51929e0fbed5d6895b9577a55dbc561daaa36f (patch) | |
| tree | e34c53dc90eaadc636f2fee0834aa1d8f86aee93 /src | |
| parent | bd77127353240e3c9694a47579ae940c10a0e985 (diff) | |
| parent | 66c8d13341a074fd3e7978e5b385f765c8d7d895 (diff) | |
| download | rabbitmq-server-git-0a51929e0fbed5d6895b9577a55dbc561daaa36f.tar.gz | |
Merging bug 22615 onto default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_misc.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 028b0d73ea..2c1808465f 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -43,6 +43,7 @@ -export([r/3, r/2, r_arg/4, rs/1]). -export([enable_cover/0, report_cover/0]). -export([enable_cover/1, report_cover/1]). +-export([start_cover/1]). -export([throw_on_error/2, with_exit_handler/2, filter_exit_map/2]). -export([with_user/2, with_vhost/2, with_user_and_vhost/3]). -export([execute_mnesia_transaction/1]). @@ -97,6 +98,7 @@ undefined | r(K) when is_subtype(K, atom())). -spec(rs/1 :: (r(atom())) -> string()). -spec(enable_cover/0 :: () -> ok_or_error()). +-spec(start_cover/1 :: ([{string(), string()} | string()]) -> 'ok'). -spec(report_cover/0 :: () -> 'ok'). -spec(enable_cover/1 :: (file_path()) -> ok_or_error()). -spec(report_cover/1 :: (file_path()) -> 'ok'). @@ -228,6 +230,10 @@ enable_cover(Root) -> _ -> ok end. +start_cover(NodesS) -> + {ok, _} = cover:start([makenode(N) || N <- NodesS]), + ok. + report_cover() -> report_cover("."). diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 82f2d19918..d645d183d1 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -625,8 +625,12 @@ test_cluster_management2(SecondaryNode) -> ok = control_action(stop_app, []), %% NB: this will log an inconsistent_database error, which is harmless + %% Turning cover on / off is OK even if we're not in general using cover, + %% it just turns the engine on / off, doesn't actually log anything. + cover:stop([SecondaryNode]), true = disconnect_node(SecondaryNode), pong = net_adm:ping(SecondaryNode), + cover:start([SecondaryNode]), %% leaving a cluster as a ram node ok = control_action(reset, []), |