From 400d41eda5eca53b6b752c5b442d0f548266ce23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Fri, 1 Apr 2016 17:43:39 +0200
Subject: Modernize use of timetraps

---
 lib/os_mon/test/cpu_sup_SUITE.erl | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'lib/os_mon/test/cpu_sup_SUITE.erl')

diff --git a/lib/os_mon/test/cpu_sup_SUITE.erl b/lib/os_mon/test/cpu_sup_SUITE.erl
index e061fd87c6..597e53044d 100644
--- a/lib/os_mon/test/cpu_sup_SUITE.erl
+++ b/lib/os_mon/test/cpu_sup_SUITE.erl
@@ -21,7 +21,7 @@
 -include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -31,9 +31,6 @@
 -export([port/1]).
 -export([terminate/1, unavailable/1, restart/1]).
 
-%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(1)).
-
 init_per_suite(Config) when is_list(Config) ->
     ok = application:start(os_mon),
     Config.
@@ -46,18 +43,17 @@ init_per_testcase(unavailable, Config) ->
     terminate(Config),
     init_per_testcase(dummy, Config);
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
 
 end_per_testcase(unavailable, Config) ->
     restart(Config),
     end_per_testcase(dummy, Config);
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     case test_server:os_type() of
@@ -71,16 +67,6 @@ all() ->
         _OS -> [unavailable]
     end.
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 load_api(suite) ->
     [];
 load_api(doc) ->
-- 
cgit v1.2.3