aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-03-04 09:37:38 +0100
committerLukas Larsson <[email protected]>2011-03-04 09:37:38 +0100
commit03ee5e80434aa2c86196832a8b9eaf78fe2e8f5d (patch)
treeac5a306225e34ce48590a8db74424a0f0759dcc5 /lib
parent840026b8a94e7575e07ba6da2d74be22cf9d8bdf (diff)
parent01873381c2288a12e93b4bdb13b68c8f80039988 (diff)
downloadotp-03ee5e80434aa2c86196832a8b9eaf78fe2e8f5d.tar.gz
otp-03ee5e80434aa2c86196832a8b9eaf78fe2e8f5d.tar.bz2
otp-03ee5e80434aa2c86196832a8b9eaf78fe2e8f5d.zip
Merge branch 'lukas/os_mon/disk_sup_unavailable_solaris/OTP-8768' into dev
* lukas/os_mon/disk_sup_unavailable_solaris/OTP-8768: Update unavailable test case to do setup and teardown
Diffstat (limited to 'lib')
-rw-r--r--lib/os_mon/test/disksup_SUITE.erl6
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),