diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-05-01 14:27:04 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-05-01 14:27:04 +0100 |
| commit | e787dcfdae7bc055e2ee13c70ed14b3eacba5a9e (patch) | |
| tree | cb187cc5594186d40888d47c9e760fe8bdd77a03 | |
| parent | d8dcf2be28a9b95809525c26ce306693a9708e87 (diff) | |
| parent | 57bc69b6895cf0f6aca14082386e01666ceef48f (diff) | |
| download | rabbitmq-server-git-e787dcfdae7bc055e2ee13c70ed14b3eacba5a9e.tar.gz | |
stable to default
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 10 |
2 files changed, 0 insertions, 13 deletions
@@ -250,9 +250,6 @@ start-cover: all echo "rabbit_misc:start_cover([\"rabbit\", \"hare\"])." | $(ERL_CALL) echo "rabbit_misc:enable_cover([\"$(COVER_DIR)\"])." | $(ERL_CALL) -start-secondary-cover: all - echo "rabbit_misc:start_cover([\"hare\"])." | $(ERL_CALL) - stop-cover: all echo "rabbit_misc:report_cover(), cover:stop()." | $(ERL_CALL) cat cover/summary.txt diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 9e5cf2c030..ab95196d96 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -90,19 +90,9 @@ do_if_secondary_node(Up, Down) -> setup_cluster() -> do_if_secondary_node( fun (SecondaryNode) -> - cover:stop(SecondaryNode), ok = control_action(stop_app, []), - %% 'cover' does not cope at all well with nodes disconnecting, - %% which happens as part of reset. So we turn it off - %% temporarily. That is ok even if we're not in general using - %% cover, it just turns the engine on / off and doesn't log - %% anything. Note that this way cover won't be on when joining - %% the cluster, but this is OK since we're testing the clustering - %% interface elsewere anyway. - cover:stop(nodes()), ok = control_action(join_cluster, [atom_to_list(SecondaryNode)]), - cover:start(nodes()), ok = control_action(start_app, []), ok = control_action(start_app, SecondaryNode, [], []) end, |