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/code_SUITE.erl | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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

diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 13d3809ef6..bdd54f533e 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -46,7 +46,9 @@
 
 -export([compile_load/4]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() ->
     [set_path, get_path, add_path, add_paths, del_path,
@@ -92,10 +94,8 @@ init_per_testcase(big_boot_embedded, Config) ->
 	    {skip, "Needs crypto!"}
     end;
 init_per_testcase(_Func, Config) ->
-    Dog=?t:timetrap(?t:minutes(5)),
-    P=code:get_path(),
-    P=code:get_path(),
-    [{watchdog, Dog}, {code_path, P}|Config].
+    P = code:get_path(),
+    [{code_path, P}|Config].
 
 end_per_testcase(TC, Config) when TC == mult_lib_roots;
 				  TC == big_boot_embedded ->
@@ -108,8 +108,6 @@ end_per_testcase(_Func, Config) ->
 
 end_per_testcase(Config) ->
     code:purge(code_b_test),
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     P=?config(code_path, Config),
     true=code:set_path(P),
     P=code:get_path(),
-- 
cgit v1.2.3