From 6e9038f942dbe5f7968c2f6467f3d85a7fe458a2 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Wed, 19 Dec 2012 16:05:08 +0100
Subject: [common_test] Stop cover on slave node after node is terminated

Before terminating slave nodes, common_test calls cover:flush/1 to
fetch data from the node without actually stopping cover on this
node. If cover is not stopped for the node and a new node with the
same name is started, then cover will be started on the new node. To
avoid this common_test now calls cover:stop/1 after the slave node is
terminated.
---
 lib/common_test/src/ct_slave.erl         | 28 +++++++++++++++++++++-------
 lib/common_test/test/ct_test_support.erl | 31 +++++++++++++++++++++----------
 2 files changed, 42 insertions(+), 17 deletions(-)

(limited to 'lib')

diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 58633b7de6..1fd8c04f8b 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -449,15 +449,29 @@ wait_for_node_alive(Node, N) ->
 
 % call init:stop on a remote node
 do_stop(ENode) ->
-    case test_server:is_cover() of
-	true ->
-	    MainCoverNode = cover:get_main_node(),
-	    rpc:call(MainCoverNode,cover,flush,[ENode]);
-	false ->
-	    ok
+    {Cover,MainCoverNode} =
+	case test_server:is_cover() of
+	    true ->
+		Main = cover:get_main_node(),
+		rpc:call(Main,cover,flush,[ENode]),
+		{true,Main};
+	    false ->
+		{false,undefined}
     end,
     spawn(ENode, init, stop, []),
-    wait_for_node_dead(ENode, 5).
+    case wait_for_node_dead(ENode, 5) of
+	{ok,ENode} ->
+	    if Cover ->
+		    %% To avoid that cover is started again if a node
+		    %% with the same name is started later.
+		    rpc:call(MainCoverNode,cover,stop,[ENode]);
+	       true ->
+		    ok
+	    end,
+	    {ok,ENode};
+	Error ->
+	    Error
+    end.
 
 % wait N seconds until node is disconnected
 wait_for_node_dead(Node, 0) ->
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index e5e2e68fcb..fc572aa82f 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -117,11 +117,7 @@ end_per_suite(Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     PrivDir = proplists:get_value(priv_dir, Config),
     true = rpc:call(CTNode, code, del_path, [filename:join(PrivDir,"")]),
-    case test_server:is_cover() of
-	true -> cover:flush(CTNode);
-	false -> ok
-    end,
-    slave:stop(CTNode),
+    slave_stop(CTNode),
     ok.
 
 %%%-----------------------------------------------------------------
@@ -152,11 +148,7 @@ end_per_testcase(_TestCase, Config) ->
     case wait_for_ct_stop(CTNode) of
 	%% Common test was not stopped to we restart node.
 	false ->
-	    case test_server:is_cover() of
-		true -> cover:flush(CTNode);
-		false -> ok
-	    end,
-	    slave:stop(CTNode),
+	    slave_stop(CTNode),
 	    start_slave(Config,proplists:get_value(trace_level,Config)),
 	    {fail, "Could not stop common_test"};
 	true ->
@@ -1274,3 +1266,22 @@ rm_files([F | Fs]) ->
 rm_files([]) ->
     ok.
     
+%%%-----------------------------------------------------------------
+%%%
+slave_stop(Node) ->
+    Cover = test_server:is_cover(),
+    if Cover-> cover:flush(Node);
+       true -> ok
+    end,
+    erlang:monitor_node(Node, true),
+    slave:stop(Node),
+    receive
+	{nodedown, Node} ->
+	    if Cover -> cover:stop(Node);
+	       true -> ok
+	    end
+    after 5000 ->
+	    erlang:monitor_node(Node, false),
+	    receive {nodedown, Node} -> ok after 0 -> ok end %flush
+    end,
+    ok.
-- 
cgit v1.2.3