diff options
| author | Björn Gustavsson <bjorn@erlang.org> | 2016-03-02 16:10:02 +0100 |
|---|---|---|
| committer | Björn Gustavsson <bjorn@erlang.org> | 2016-03-09 14:02:50 +0100 |
| commit | 9870d22b2401b60221aa42c78bdb7ec4a812e9e7 (patch) | |
| tree | f0d4e4d0feb88c64695cb63d6d072969b2a157ff /lib/kernel/test/inet_res_SUITE.erl | |
| parent | bb1eb9bfa336afeb945fd1a5c494cfdaefb5183d (diff) | |
| download | erlang-9870d22b2401b60221aa42c78bdb7ec4a812e9e7.tar.gz | |
Modernize timetraps
Diffstat (limited to 'lib/kernel/test/inet_res_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/inet_res_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl index ea06061c74..d91e575aaa 100644 --- a/lib/kernel/test/inet_res_SUITE.erl +++ b/lib/kernel/test/inet_res_SUITE.erl @@ -42,7 +42,9 @@ -define(RUN_NAMED, "run-named"). -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,1}}]. all() -> [basic, resolve, edns0, txt_record, files_monitor, @@ -88,15 +90,13 @@ init_per_testcase(Func, Config) -> inet_db:ins_alt_ns(IP, Port); _ -> ok end, - Dog = test_server:timetrap(test_server:seconds(20)), - [{nameserver,NsSpec},{res_lookup,Lookup},{watchdog,Dog}|Config] + [{nameserver,NsSpec},{res_lookup,Lookup}|Config] catch SkipReason -> {skip,SkipReason} end. end_per_testcase(_Func, Config) -> - test_server:timetrap_cancel(?config(watchdog, Config)), inet_db:set_lookup(?config(res_lookup, Config)), NsSpec = ?config(nameserver, Config), case NsSpec of |