diff options
| author | Micael Karlberg <[email protected]> | 2011-03-07 14:55:11 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-07 14:55:11 +0100 |
| commit | c959a0cd5392d356e8bda8d7eb9d0e71a88360b3 (patch) | |
| tree | 44857e835210e771185bdf64ac8e4a42ad003d0a /lib/os_mon | |
| parent | db29f9ede14ff5b8d747230fcad8ffa1b157f1e1 (diff) | |
| parent | f85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff) | |
| download | otp-c959a0cd5392d356e8bda8d7eb9d0e71a88360b3.tar.gz otp-c959a0cd5392d356e8bda8d7eb9d0e71a88360b3.tar.bz2 otp-c959a0cd5392d356e8bda8d7eb9d0e71a88360b3.zip | |
Merge branch 'dev' into bmk/inets/httpc/support_upload_body_streaming/OTP-OTP-9094
Diffstat (limited to 'lib/os_mon')
| -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), |