diff options
author | Björn Gustavsson <[email protected]> | 2016-02-26 06:47:38 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2016-03-09 12:05:19 +0100 |
commit | db87ef023f4660fd2129f30dbbff05e73bff3dd5 (patch) | |
tree | b97030bda2efea02fc58e5f0eaebd1450bb00d82 /lib/stdlib/test/fixtable_SUITE.erl | |
parent | aeccfd1c8441ac0caa0c86aac19747eb64bd267d (diff) | |
download | otp-db87ef023f4660fd2129f30dbbff05e73bff3dd5.tar.gz otp-db87ef023f4660fd2129f30dbbff05e73bff3dd5.tar.bz2 otp-db87ef023f4660fd2129f30dbbff05e73bff3dd5.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/stdlib/test/fixtable_SUITE.erl')
-rw-r--r-- | lib/stdlib/test/fixtable_SUITE.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/stdlib/test/fixtable_SUITE.erl b/lib/stdlib/test/fixtable_SUITE.erl index 66150e60c1..655002c611 100644 --- a/lib/stdlib/test/fixtable_SUITE.erl +++ b/lib/stdlib/test/fixtable_SUITE.erl @@ -33,7 +33,9 @@ %%% Internal exports -export([command_loop/0,start_commander/0]). -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,1}}]. all() -> [multiple_fixes, multiple_processes, @@ -70,12 +72,9 @@ end_per_group(_GroupName, Config) -> init_per_testcase(_Func, Config) -> PrivDir = ?config(priv_dir,Config), file:make_dir(PrivDir), - Dog=test_server:timetrap(test_server:seconds(60)), - [{watchdog, Dog}|Config]. + Config. end_per_testcase(_Func, Config) -> - Dog=?config(watchdog, Config), - test_server:timetrap_cancel(Dog), lists:foreach(fun(X) -> (catch dets:close(X)), (catch file:delete(dets_filename(X,Config))) |