aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-10-22 16:13:50 +0200
committerSiri Hansen <[email protected]>2012-10-30 11:18:42 +0100
commit3d4ea1aa4226e10b6daab29ae34f60deb0ecd7a9 (patch)
treebc4954838a1e26672fa1f9085484e33cb5da4ee9 /lib/test_server
parentf6c1c3127f027cd717d01613cd356c5ada35041c (diff)
downloadotp-3d4ea1aa4226e10b6daab29ae34f60deb0ecd7a9.tar.gz
otp-3d4ea1aa4226e10b6daab29ae34f60deb0ecd7a9.tar.bz2
otp-3d4ea1aa4226e10b6daab29ae34f60deb0ecd7a9.zip
[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.
Diffstat (limited to 'lib/test_server')
-rw-r--r--lib/test_server/test/test_server_test_lib.erl7
1 files changed, 6 insertions, 1 deletions
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}.