aboutsummaryrefslogtreecommitdiffstats
path: root/lib/debugger/test/int_SUITE.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-02-26 06:47:38 +0100
committerBjörn Gustavsson <[email protected]>2016-04-18 08:10:36 +0200
commit87c18e235cbcce8edc19d3bb154bf0cfa51a7c62 (patch)
tree2e9641facc0c409e74e14648c40c3d482f2110a3 /lib/debugger/test/int_SUITE.erl
parent6c9822baad0ad7e0c535a023b45cee24619b301e (diff)
downloadotp-87c18e235cbcce8edc19d3bb154bf0cfa51a7c62.tar.gz
otp-87c18e235cbcce8edc19d3bb154bf0cfa51a7c62.tar.bz2
otp-87c18e235cbcce8edc19d3bb154bf0cfa51a7c62.zip
Modernize use of timetraps
Either rely on the default 30 minutes timetrap, or set the timeout using the supported methods in common_test.
Diffstat (limited to 'lib/debugger/test/int_SUITE.erl')
-rw-r--r--lib/debugger/test/int_SUITE.erl19
1 files changed, 6 insertions, 13 deletions
diff --git a/lib/debugger/test/int_SUITE.erl b/lib/debugger/test/int_SUITE.erl
index 31257d16e9..4601e516b2 100644
--- a/lib/debugger/test/int_SUITE.erl
+++ b/lib/debugger/test/int_SUITE.erl
@@ -31,12 +31,8 @@
-export([interpret/1, guards/1, interpretable/1]).
-export([ append_1/1, append_2/1, member/1, reverse/1]).
-%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(1)).
-
init_per_testcase(interpretable, Config) ->
- ?line Dog=test_server:timetrap(?default_timeout),
- [{watchdog, Dog}|Config];
+ Config;
init_per_testcase(_Case, Config) ->
%% Interpret some existing and non-existing modules
@@ -44,12 +40,9 @@ init_per_testcase(_Case, Config) ->
?line {module, lists1} = int:i(filename:join([DataDir,lists1])),
?line {module, guards} = int:i(filename:join([DataDir,guards])),
- ?line Dog=test_server:timetrap(?default_timeout),
- [{watchdog, Dog}|Config].
+ Config.
-end_per_testcase(interpretable, Config) ->
- ?line Dog=?config(watchdog, Config),
- ?line test_server:timetrap_cancel(Dog),
+end_per_testcase(interpretable, _Config) ->
ok;
end_per_testcase(_Case, Config) ->
@@ -57,11 +50,11 @@ end_per_testcase(_Case, Config) ->
?line ok = int:n(lists1),
?line ok = int:n(guards),
- ?line Dog=?config(watchdog, Config),
- ?line test_server:timetrap_cancel(Dog),
?line ok.
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+ [{ct_hooks,[ts_install_cth]},
+ {timetrap,{minutes,1}}].
all() ->
[interpret, guards, {group, list_suite}, interpretable].