diff options
author | Micael Karlberg <[email protected]> | 2011-03-07 15:43:06 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-03-07 15:43:06 +0100 |
commit | 5c8338fcadd68589814a7098e001b036109c5ee7 (patch) | |
tree | 4a89c1feb52b8ec862cfa46c8b502ea3880217be /lib/os_mon/test/disksup_SUITE.erl | |
parent | f39098ac6f487f7142e4597930ee3bb709362c4a (diff) | |
parent | f85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff) | |
download | otp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.gz otp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.bz2 otp-5c8338fcadd68589814a7098e001b036109c5ee7.zip |
Merge branch 'dev' into bmk/inets/httpd/dont_send_empty_chunk/OTP-9091
Diffstat (limited to 'lib/os_mon/test/disksup_SUITE.erl')
-rw-r--r-- | lib/os_mon/test/disksup_SUITE.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/os_mon/test/disksup_SUITE.erl b/lib/os_mon/test/disksup_SUITE.erl index 6e015ef74a..a3c6c7782d 100644 --- a/lib/os_mon/test/disksup_SUITE.erl +++ b/lib/os_mon/test/disksup_SUITE.erl @@ -41,10 +41,16 @@ end_per_suite(Config) when is_list(Config) -> ?line ok = application:stop(os_mon), Config. +init_per_testcase(unavailable, Config) -> + terminate(Config), + init_per_testcase(dummy, Config); init_per_testcase(_Case, Config) -> Dog = ?t:timetrap(?default_timeout), [{watchdog,Dog} | Config]. +end_per_testcase(unavailable, Config) -> + restart(Config), + end_per_testcase(dummy, Config); end_per_testcase(_Case, Config) -> Dog = ?config(watchdog, Config), ?t:timetrap_cancel(Dog), |