diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-04-16 10:58:04 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-04-16 10:58:04 +0100 |
| commit | 71d2ec0691eacf99a274881aaf50d3ba93f0d80a (patch) | |
| tree | 1ac588e3c26e0329905a2579940fb424c64b19e8 | |
| parent | dd689096cfce851239646df70aaf1f22decd4d55 (diff) | |
| parent | dd07646f40a2ecdcd3637c08efb884dc563d580f (diff) | |
| download | rabbitmq-server-git-71d2ec0691eacf99a274881aaf50d3ba93f0d80a.tar.gz | |
merge bug20599 into v1_5
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -87,11 +87,10 @@ run-node: all run-tests: all echo "rabbit_tests:all_tests()." | $(ERL_CALL) -start-background-node: stop-node +start-background-node: $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ RABBITMQ_NODE_ONLY=true \ - RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \ - ./scripts/rabbitmq-server ; sleep 1 + ./scripts/rabbitmq-server -detached; sleep 1 start-rabbit-on-node: all echo "rabbit:start()." | $(ERL_CALL) diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index df2e71d9e6..6706ecd1fc 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. |