aboutsummaryrefslogtreecommitdiffstats
path: root/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-04-22 14:53:19 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-04-22 14:53:19 +0200
commitb2f661092782f386047b03db0eb649f1ca9a3088 (patch)
tree63dc84908c68f4a6baff722261e38f73b1caee14 /lib/runtime_tools/test/erts_alloc_config_SUITE.erl
parent4a6ef55b3bcb8176eaf3383690808bdedf030a38 (diff)
downloadotp-b2f661092782f386047b03db0eb649f1ca9a3088.tar.gz
otp-b2f661092782f386047b03db0eb649f1ca9a3088.tar.bz2
otp-b2f661092782f386047b03db0eb649f1ca9a3088.zip
Modernize use of timetraps
Diffstat (limited to 'lib/runtime_tools/test/erts_alloc_config_SUITE.erl')
-rw-r--r--lib/runtime_tools/test/erts_alloc_config_SUITE.erl28
1 files changed, 4 insertions, 24 deletions
diff --git a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
index 68926b012c..100e2fc563 100644
--- a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
+++ b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
@@ -25,9 +25,7 @@
-include_lib("common_test/include/ct.hrl").
%-compile(export_all).
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
- init_per_group/2,end_per_group/2,
- init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0, init_per_testcase/2, end_per_testcase/2]).
%% Testcases
-export([basic/1]).
@@ -35,36 +33,18 @@
%% internal export
-export([make_basic_config/1]).
--define(DEFAULT_TIMEOUT, ?t:minutes(2)).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+ [{ct_hooks,[ts_install_cth]},
+ {timetrap, {minutes, 2}}].
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.
-
-
init_per_testcase(Case, Config) when is_list(Config) ->
[{testcase, Case},
- {watchdog, ?t:timetrap(?DEFAULT_TIMEOUT)},
{erl_flags_env, save_env()} | Config].
end_per_testcase(_Case, Config) when is_list(Config) ->
- ?t:timetrap_cancel(?config(watchdog, Config)),
restore_env(?config(erl_flags_env, Config)),
ok.