diff options
author | Björn Gustavsson <bjorn@erlang.org> | 2016-02-26 06:47:38 +0100 |
---|---|---|
committer | Björn Gustavsson <bjorn@erlang.org> | 2016-03-09 12:05:19 +0100 |
commit | db87ef023f4660fd2129f30dbbff05e73bff3dd5 (patch) | |
tree | b97030bda2efea02fc58e5f0eaebd1450bb00d82 /lib/stdlib/test/queue_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/queue_SUITE.erl')
-rw-r--r-- | lib/stdlib/test/queue_SUITE.erl | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/stdlib/test/queue_SUITE.erl b/lib/stdlib/test/queue_SUITE.erl index 77fe6adb7c..f6331398a2 100644 --- a/lib/stdlib/test/queue_SUITE.erl +++ b/lib/stdlib/test/queue_SUITE.erl @@ -19,26 +19,23 @@ %% -module(queue_SUITE). -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, + init_per_testcase/2, end_per_testcase/2, init_per_group/2,end_per_group/2]). -export([do/1, to_list/1, io_test/1, op_test/1, error/1, oops/1]). --export([init_per_testcase/2, end_per_testcase/2]). -include_lib("common_test/include/ct.hrl"). -% Default timetrap timeout (set in init_per_testcase). --define(default_timeout, ?t:minutes(1)). - init_per_testcase(_Case, Config) -> - ?line Dog = ?t:timetrap(?default_timeout), - [{watchdog, Dog} | Config]. -end_per_testcase(_Case, Config) -> - Dog = ?config(watchdog, Config), - test_server:timetrap_cancel(Dog), + Config. + +end_per_testcase(_Case, _Config) -> ok. -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,1}}]. all() -> [do, to_list, io_test, op_test, error, oops]. |