diff options
| author | Björn Gustavsson <[email protected]> | 2016-03-02 16:10:02 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-03-09 14:02:50 +0100 |
| commit | 9870d22b2401b60221aa42c78bdb7ec4a812e9e7 (patch) | |
| tree | f0d4e4d0feb88c64695cb63d6d072969b2a157ff /lib/kernel/test/bif_SUITE.erl | |
| parent | bb1eb9bfa336afeb945fd1a5c494cfdaefb5183d (diff) | |
| download | otp-9870d22b2401b60221aa42c78bdb7ec4a812e9e7.tar.gz otp-9870d22b2401b60221aa42c78bdb7ec4a812e9e7.tar.bz2 otp-9870d22b2401b60221aa42c78bdb7ec4a812e9e7.zip | |
Modernize timetraps
Diffstat (limited to 'lib/kernel/test/bif_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/bif_SUITE.erl | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/kernel/test/bif_SUITE.erl b/lib/kernel/test/bif_SUITE.erl index 284ca8f377..8fb84b5d1c 100644 --- a/lib/kernel/test/bif_SUITE.erl +++ b/lib/kernel/test/bif_SUITE.erl @@ -40,18 +40,15 @@ -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() -> [{group, spawn_tests}, {group, spawn_link_tests}, @@ -533,7 +530,6 @@ wilderness(doc) -> wilderness(suite) -> []; wilderness(Config) when is_list(Config) -> - ?line Dog = ?t:timetrap(?default_timeout), ?line OKParams = {512, 8}, ?line Alloc = erlang:system_info(allocator), ?line test_server:format("Test server allocator info:~n~p", [Alloc]), @@ -549,7 +545,6 @@ wilderness(Config) when is_list(Config) -> "Allocator used: " ++ atom_to_list(OtherAllocator)} end, - ?line test_server:timetrap_cancel(Dog), Result. run_wilderness_test({Set_tt, Set_tp}, {Exp_tt, Exp_tp}) -> |