aboutsummaryrefslogtreecommitdiffstats
path: root/lib/os_mon/test/os_mon_SUITE.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-04-01 17:43:39 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-04-01 17:43:39 +0200
commit400d41eda5eca53b6b752c5b442d0f548266ce23 (patch)
tree4d2f1022071d3ccf70d4c3959236a6c00f2f71af /lib/os_mon/test/os_mon_SUITE.erl
parent5d8ec8313876352d128c2fb6e368b77e85b479f0 (diff)
downloadotp-400d41eda5eca53b6b752c5b442d0f548266ce23.tar.gz
otp-400d41eda5eca53b6b752c5b442d0f548266ce23.tar.bz2
otp-400d41eda5eca53b6b752c5b442d0f548266ce23.zip
Modernize use of timetraps
Diffstat (limited to 'lib/os_mon/test/os_mon_SUITE.erl')
-rw-r--r--lib/os_mon/test/os_mon_SUITE.erl36
1 files changed, 4 insertions, 32 deletions
diff --git a/lib/os_mon/test/os_mon_SUITE.erl b/lib/os_mon/test/os_mon_SUITE.erl
index a80d30f6b0..af70dc2a6c 100644
--- a/lib/os_mon/test/os_mon_SUITE.erl
+++ b/lib/os_mon/test/os_mon_SUITE.erl
@@ -21,26 +21,14 @@
-include_lib("common_test/include/ct.hrl").
%% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
- init_per_group/2,end_per_group/2]).
--export([init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0]).
%% Test cases
-export([app_file/1, appup_file/1, config/1]).
-%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(1)).
-
-init_per_testcase(_Case, Config) ->
- Dog = test_server:timetrap(?default_timeout),
- [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
- Dog = ?config(watchdog, Config),
- test_server:timetrap_cancel(Dog),
- ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+ [{ct_hooks,[ts_install_cth]},
+ {timetrap,{minutes,1}}].
all() ->
case test_server:os_type() of
@@ -48,22 +36,6 @@ all() ->
_OS -> [app_file, appup_file]
end.
-groups() ->
- [].
-
-init_per_suite(Config) ->
- Config.
-
-end_per_suite(_Config) ->
- ok.
-
-init_per_group(_GroupName, Config) ->
- Config.
-
-end_per_group(_GroupName, Config) ->
- Config.
-
-
app_file(suite) ->
[];
app_file(doc) ->