From 9870d22b2401b60221aa42c78bdb7ec4a812e9e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 2 Mar 2016 16:10:02 +0100
Subject: Modernize timetraps

---
 lib/kernel/test/application_SUITE.erl | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'lib/kernel/test/application_SUITE.erl')

diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 0ff512bb6e..93c79e588b 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -44,10 +44,10 @@
 
 -export([init_per_testcase/2, end_per_testcase/2, start_type/0, 
 	 start_phase/0, conf_change/0]).
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(2)).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [failover, failover_comp, permissions, load,
@@ -82,20 +82,14 @@ end_per_group(_GroupName, Config) ->
 
 init_per_testcase(otp_2973=Case, Config) ->
     code:add_path(?config(data_dir,Config)),
-    Dog = test_server:timetrap(?default_timeout),
-    [{?TESTCASE, Case}, {watchdog, Dog}|Config];
+    [{?TESTCASE, Case}|Config];
 init_per_testcase(Case, Config) ->
-    Dog = test_server:timetrap(?default_timeout),
-    [{?TESTCASE, Case}, {watchdog, Dog}|Config].
+    [{?TESTCASE, Case}|Config].
 
 end_per_testcase(otp_2973, Config) ->
     code:del_path(?config(data_dir,Config)),
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
     ok;
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 -define(UNTIL(Seq), loop_until_true(fun() -> Seq end)).
-- 
cgit v1.2.3