diff options
| author | Simon MacMullen <simon@lshift.net> | 2010-04-20 16:01:46 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@lshift.net> | 2010-04-20 16:01:46 +0100 |
| commit | 11848f3d18caaeb62c7b15ad5643d7088d95bb0f (patch) | |
| tree | 7bc3ff1af90d4e161493a3913c91e3f63039c738 | |
| parent | 03df325a8ce7ba80e299665a07f65fd62750e2ea (diff) | |
| download | rabbitmq-server-11848f3d18caaeb62c7b15ad5643d7088d95bb0f.tar.gz | |
Make start-secondary-cover actually do something, stop Erlang tests blowing up.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -172,7 +172,7 @@ start-cover: all echo "cover:start(), rabbit_misc:enable_cover([\"$(COVER_DIR)\"])." | $(ERL_CALL) start-secondary-cover: - echo "rabbit_misc:enable_cover_node(\"$(SECONDARY_NODENAME)\")." | $(ERL_CALL) + echo "rabbit_misc:enable_cover_node(\"$(SECONDARY_NODENAME)\")." | $(ERL_CALL) stop-cover: all echo "rabbit_misc:report_cover(), cover:stop()." | $(ERL_CALL) diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 82f2d199..d645d183 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, []), |