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/epp_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/epp_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/epp_SUITE.erl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl index 0c00e104b7..a89e29a91b 100644 --- a/lib/stdlib/test/epp_SUITE.erl +++ b/lib/stdlib/test/epp_SUITE.erl @@ -50,19 +50,16 @@ config(data_dir, _) -> -include_lib("common_test/include/ct.hrl"). -export([init_per_testcase/2, end_per_testcase/2]). -% Default timetrap timeout (set in init_per_testcase). --define(default_timeout, ?t:minutes(1)). - init_per_testcase(_, Config) -> - ?line Dog = ?t:timetrap(?default_timeout), - [{watchdog, Dog} | Config]. -end_per_testcase(_, Config) -> - Dog = ?config(watchdog, Config), - test_server:timetrap_cancel(Dog), + Config. + +end_per_testcase(_, _Config) -> ok. -endif. -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,1}}]. all() -> [rec_1, {group, upcase_mac}, include_local, predef_mac, |