From ea653688157c0e006c75dd5913a3b192c5c4882d Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 15 Apr 2009 12:41:31 +0100 Subject: remove silly dependency 'start' should fail when the node is already running, rather than killing it --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cb3f5999..2414aa2d 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ 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" \ -- cgit v1.2.1 From 35ec50ef6bc9e4a0c946c266c48d2fd01745ebe6 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 15 Apr 2009 12:42:53 +0100 Subject: better way to start background node --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2414aa2d..64e008c1 100644 --- a/Makefile +++ b/Makefile @@ -90,8 +90,7 @@ run-tests: all 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) -- cgit v1.2.1 From a86da414a8a26d1235b3c167224281cf22f6a92a Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 15 Apr 2009 12:44:38 +0100 Subject: leave system in clustered state ...when testing clustering. That allows other tests of clustering-related features to commence subsequently. --- src/rabbit_tests.erl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index df2e71d9..6706ecd1 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. -- cgit v1.2.1