aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test/file_name_SUITE.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-03-02 16:10:02 +0100
committerBjörn Gustavsson <[email protected]>2016-03-09 14:02:50 +0100
commit9870d22b2401b60221aa42c78bdb7ec4a812e9e7 (patch)
treef0d4e4d0feb88c64695cb63d6d072969b2a157ff /lib/kernel/test/file_name_SUITE.erl
parentbb1eb9bfa336afeb945fd1a5c494cfdaefb5183d (diff)
downloadotp-9870d22b2401b60221aa42c78bdb7ec4a812e9e7.tar.gz
otp-9870d22b2401b60221aa42c78bdb7ec4a812e9e7.tar.bz2
otp-9870d22b2401b60221aa42c78bdb7ec4a812e9e7.zip
Modernize timetraps
Diffstat (limited to 'lib/kernel/test/file_name_SUITE.erl')
-rw-r--r--lib/kernel/test/file_name_SUITE.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index e6f8761f95..e4b5b88f00 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -79,14 +79,14 @@
init_per_testcase(_Func, Config) ->
- Dog = test_server:timetrap(test_server:seconds(60)),
- [{watchdog,Dog}|Config].
+ Config.
-end_per_testcase(_Func, Config) ->
- Dog = ?config(watchdog, Config),
- test_server:timetrap_cancel(Dog).
+end_per_testcase(_Func, _Config) ->
+ ok.
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+ [{ct_hooks,[ts_install_cth]},
+ {timetrap,{minutes,1}}].
all() ->
[normal, icky, very_icky, normalize, home_dir].