From 6c3ef2850de2c45699885a6bbbed6e43b110b2d9 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Mon, 1 Oct 2012 16:22:19 +0200
Subject: Migrate timers from test_server to ct interface

---
 lib/asn1/test/asn1_SUITE.erl | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'lib/asn1/test/asn1_SUITE.erl')

diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index b0c37d79e7..9a6201455d 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -51,7 +51,8 @@
 %% Suite definition
 %%------------------------------------------------------------------------------
 
-suite() -> [{ct_hooks, [ts_install_cth]}].
+suite() -> [{ct_hooks, [ts_install_cth]},
+	    {timetrap,{minutes,60}}].
 
 all() ->
     [{group, parallel},
@@ -241,15 +242,10 @@ init_per_testcase(Func, Config) ->
     ok = filelib:ensure_dir(filename:join([CaseDir, dummy_file])),
     true = code:add_patha(CaseDir),
 
-    Dog = case Func of
-              testX420 -> test_server:timetrap({minutes, 90});
-              _        -> test_server:timetrap({minutes, 60})
-          end,
-    [{case_dir, CaseDir}, {watchdog, Dog}|Config].
+    [{case_dir, CaseDir}|Config].
 
 end_per_testcase(_Func, Config) ->
-    code:del_path(?config(case_dir, Config)),
-    test_server:timetrap_cancel(?config(watchdog, Config)).
+    code:del_path(?config(case_dir, Config)).
 
 %%------------------------------------------------------------------------------
 %% Test runners
@@ -1064,6 +1060,9 @@ test_modified_x420(Config) ->
     asn1_test_lib:compile_all(Files, Config, [der]),
     test_modified_x420:test_io(Config).
 
+
+testX420() ->
+    [{timetrap,{minutes,90}}].
 testX420(Config) ->
     test(Config, fun testX420/3, [ber, ber_bin, ber_bin_v2]).
 testX420(Config, Rule, Opts) ->
-- 
cgit v1.2.3