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/zlib_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/zlib_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/zlib_SUITE.erl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl index d9d4c138d5..1155157815 100644 --- a/lib/kernel/test/zlib_SUITE.erl +++ b/lib/kernel/test/zlib_SUITE.erl @@ -47,11 +47,10 @@ -define(DATA_ERROR, {'EXIT',{data_error,[{zlib,_,_,_}|_]}}). init_per_testcase(_Func, Config) -> - Dog = test_server:timetrap(test_server:seconds(60)), - [{watchdog, Dog}|Config]. -end_per_testcase(_Func, Config) -> - Dog = ?config(watchdog, Config), - test_server:timetrap_cancel(Dog). + Config. + +end_per_testcase(_Func, _Config) -> + ok. error(Format, Args, File, Line) -> io:format("~p:~p: ERROR: " ++ Format, [File,Line|Args]), @@ -70,7 +69,9 @@ error(Format, Args, File, Line) -> %% end, %% log("<>ERROR<>~n" ++ Format, Args, File, Line). -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,1}}]. all() -> [{group, api}, {group, examples}, {group, func}, smp, |