diff options
| author | Simon MacMullen <simon@lshift.net> | 2010-04-15 18:11:27 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@lshift.net> | 2010-04-15 18:11:27 +0100 |
| commit | d2c4ae88b0b524c9a53f35e032e6344826fd06f2 (patch) | |
| tree | 167a5e2afbec8ca02ac2affd0a9644deadab3747 | |
| parent | f50ee71d77000bb193bf5b6f63e217295a519e49 (diff) | |
| parent | 01ea18f7697eecfcbd72722bb5337d41b07ee4d0 (diff) | |
| download | rabbitmq-server-git-d2c4ae88b0b524c9a53f35e032e6344826fd06f2.tar.gz | |
Merge 22615 again.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -157,7 +157,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 f7060b0f60..58887f2a1e 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -650,8 +650,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, []), |