From 3d4ea1aa4226e10b6daab29ae34f60deb0ecd7a9 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Mon, 22 Oct 2012 16:13:50 +0200
Subject: [common_test, test_server] Don't flush cover if cover is not running

ct_slave, ct_test_support and test_server_test_lib always called
cover:flush/1 when stopping slave nodes. If cover was not running,
this would cause cover_server to be started and thus
test_server:is_cover/0 to return true afterwards. This has been
corrected.
---
 lib/common_test/src/ct_slave.erl              |  9 +++++++--
 lib/common_test/test/ct_test_support.erl      | 10 ++++++++--
 lib/test_server/test/test_server_test_lib.erl |  7 ++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 6f7e83d852..cb05423497 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -430,8 +430,13 @@ wait_for_node_alive(Node, N) ->
 
 % call init:stop on a remote node
 do_stop(ENode) ->
-    MainCoverNode = cover:get_main_node(),
-    rpc:call(MainCoverNode,cover,flush,[ENode]),
+    case test_server:is_cover() of
+	true ->
+	    MainCoverNode = cover:get_main_node(),
+	    rpc:call(MainCoverNode,cover,flush,[ENode]);
+	false ->
+	    ok
+    end,
     spawn(ENode, init, stop, []),
     wait_for_node_dead(ENode, 5).
 
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index c05b6d87c0..afc8dc4bb7 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -117,7 +117,10 @@ 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,"")]),
-    cover:flush(CTNode),
+    case test_server:is_cover() of
+	true -> cover:flush(CTNode);
+	false -> ok
+    end,
     slave:stop(CTNode),
     ok.
 
@@ -149,7 +152,10 @@ end_per_testcase(_TestCase, Config) ->
     case wait_for_ct_stop(CTNode) of
 	%% Common test was not stopped to we restart node.
 	false ->
-	    cover:flush(CTNode),
+	    case test_server:is_cover() of
+		true -> cover:flush(CTNode);
+		false -> ok
+	    end,
 	    slave:stop(CTNode),
 	    start_slave(Config,proplists:get_value(trace_level,Config)),
 	    {fail, "Could not stop common_test"};
diff --git a/lib/test_server/test/test_server_test_lib.erl b/lib/test_server/test/test_server_test_lib.erl
index 0dabc17173..4e89abf308 100644
--- a/lib/test_server/test/test_server_test_lib.erl
+++ b/lib/test_server/test/test_server_test_lib.erl
@@ -83,7 +83,12 @@ start_slave(Config,_Level) ->
 
 post_end_per_testcase(_TC, Config, Return, State) ->
     Node = proplists:get_value(node, Config),
-    cover:flush(Node),
+    case test_server:is_cover() of
+	true ->
+	    cover:flush(Node);
+	false ->
+	    ok
+    end,
     slave:stop(Node),
 
     {Return, State}.
-- 
cgit v1.2.3