aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools/test/cover_SUITE.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-04-06 19:46:34 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-04-07 12:10:13 +0200
commit8ccea1c2c756d8bc548ee6ba3e10f5a583aca7e7 (patch)
treedb703599c096483483796be01982d5a1bf75c072 /lib/tools/test/cover_SUITE.erl
parent146dfa9ddc3b31649ef581d65f3cb00ef95af10f (diff)
downloadotp-8ccea1c2c756d8bc548ee6ba3e10f5a583aca7e7.tar.gz
otp-8ccea1c2c756d8bc548ee6ba3e10f5a583aca7e7.tar.bz2
otp-8ccea1c2c756d8bc548ee6ba3e10f5a583aca7e7.zip
Modernize use of timetraps
Diffstat (limited to 'lib/tools/test/cover_SUITE.erl')
-rw-r--r--lib/tools/test/cover_SUITE.erl19
1 files changed, 4 insertions, 15 deletions
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 50d9f99497..421957315c 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -23,7 +23,8 @@
-include_lib("common_test/include/ct.hrl").
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+ [{ct_hooks,[ts_install_cth]}].
all() ->
NoStartStop = [eif,otp_5305,otp_5418,otp_7095,otp_8273,
@@ -42,21 +43,12 @@ all() ->
[coverage|NoStartStop++[coverage_analysis]]
end.
-groups() ->
- [].
-
init_per_suite(Config) ->
[{ct_is_running_cover,whereis(cover_server) =/= undefined}|Config].
end_per_suite(_Config) ->
ok.
-init_per_group(_GroupName, Config) ->
- Config.
-
-end_per_group(_GroupName, Config) ->
- Config.
-
init_per_testcase(TC, Config) when TC =:= misc;
TC =:= compile;
TC =:= analyse;
@@ -950,16 +942,13 @@ export_import(Config) when is_list(Config) ->
otp_5031(suite) -> [];
otp_5031(Config) when is_list(Config) ->
-
- Dog = ?t:timetrap(?t:seconds(10)),
+ ct:timetrap({seconds, 10}),
{ok,N1} = ?t:start_node(cover_SUITE_otp_5031,slave,[]),
{ok,[N1]} = cover:start(N1),
{error,not_main_node} = rpc:call(N1,cover,modules,[]),
cover:stop(),
?t:stop_node(N1),
-
- ?t:timetrap_cancel(Dog),
ok.
eif(doc) ->
@@ -1846,7 +1835,7 @@ cover_which_nodes(Expected) ->
case cover:which_nodes() of
Expected -> ok;
_ ->
- ?t:sleep(100),
+ timer:sleep(100),
Retry()
end
end),