From ddda2ac2b524c7bf4ae6a357faac4f73c20ebca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Mon, 21 Mar 2016 17:49:05 +0100
Subject: Modernize timetraps

---
 lib/erl_interface/test/port_call_SUITE.erl | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

(limited to 'lib/erl_interface/test/port_call_SUITE.erl')

diff --git a/lib/erl_interface/test/port_call_SUITE.erl b/lib/erl_interface/test/port_call_SUITE.erl
index 423e558b75..f4c7f10bb7 100644
--- a/lib/erl_interface/test/port_call_SUITE.erl
+++ b/lib/erl_interface/test/port_call_SUITE.erl
@@ -32,31 +32,18 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, basic/1]).
+-export([all/0, suite/0, basic/1]).
+
 % Private exports
 -include_lib("common_test/include/ct.hrl").
 
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
 
 all() -> 
     [basic].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 basic(suite) -> [];
 basic(Config) when is_list(Config) ->
@@ -73,7 +60,6 @@ basic(Config) when is_list(Config) ->
     end.
 
 do_basic(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
     Path = ?config(data_dir, Config),
 
     erl_ddll:start(),
@@ -105,8 +91,6 @@ do_basic(Config) ->
 
     {error, {already_started, _}} = erl_ddll:start(),
     ok = erl_ddll:stop(),
-
-    test_server:timetrap_cancel(Dog),
     ok.
 
 load_port_call_driver(Path) ->
-- 
cgit v1.2.3