aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-08-06 15:07:10 +0200
committerLukas Larsson <[email protected]>2014-08-06 15:07:10 +0200
commit85635f0d0e47ca4db56a88681c15f73f1727298a (patch)
tree850c80ce9266103d0d681123436474aba25e00d9
parente6fbeb4f03e18bbc6d4a62b0195e0c79021c41a6 (diff)
downloadotp-85635f0d0e47ca4db56a88681c15f73f1727298a.tar.gz
otp-85635f0d0e47ca4db56a88681c15f73f1727298a.tar.bz2
otp-85635f0d0e47ca4db56a88681c15f73f1727298a.zip
os_mon: Fix so that all testcases are run
For some reason only a new testcases were run on the majority of platforms. After this change all tests are run on all unix and win32 platforms.
-rw-r--r--lib/os_mon/test/disksup_SUITE.erl19
1 files changed, 7 insertions, 12 deletions
diff --git a/lib/os_mon/test/disksup_SUITE.erl b/lib/os_mon/test/disksup_SUITE.erl
index 2f62564959..f9addd96cf 100644
--- a/lib/os_mon/test/disksup_SUITE.erl
+++ b/lib/os_mon/test/disksup_SUITE.erl
@@ -49,7 +49,8 @@ init_per_testcase(_Case, Config) ->
Dog = ?t:timetrap(?default_timeout),
[{watchdog,Dog} | Config].
-end_per_testcase(unavailable, Config) ->
+end_per_testcase(TC, Config) when TC =:= unavailable;
+ TC =:= posix_only ->
restart(Config),
end_per_testcase(dummy, Config);
end_per_testcase(_Case, Config) ->
@@ -61,11 +62,10 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
all() ->
Bugs = [otp_5910],
+ Always = [api, config, alarm, port, posix_only, unavailable] ++ Bugs,
case test_server:os_type() of
- {unix, sunos} ->
- [api, config, alarm, port, unavailable, posix_only] ++ Bugs;
- {unix, _OSname} -> [api, alarm, posix_only] ++ Bugs;
- {win32, _OSname} -> [api, alarm, posix_only] ++ Bugs;
+ {unix, _OSname} -> Always;
+ {win32, _OSname} -> Always;
_OS -> [unavailable]
end.
@@ -336,6 +336,7 @@ restart(suite) ->
[];
restart(Config) when is_list(Config) ->
ok = application:set_env(os_mon, start_disksup, true),
+ ok = application:set_env(os_mon, disksup_posix_only, false),
{ok, _Pid} = supervisor:restart_child(os_mon_sup, disksup),
ok.
@@ -409,13 +410,7 @@ posix_only(Config) when is_list(Config) ->
ok = supervisor:terminate_child(os_mon_sup, disksup),
{ok, _Child1} = supervisor:restart_child(os_mon_sup, disksup),
- ok = check_get_disk_data(),
-
- %% Reset option and restart disksup
- ok = application:set_env(os_mon, disksup_posix_only, false),
- ok = supervisor:terminate_child(os_mon_sup, disksup),
- {ok, _Child2} = supervisor:restart_child(os_mon_sup, disksup),
- ok.
+ ok = check_get_disk_data().
dump_info() ->
io:format("Status: ~p~n", [sys:get_status(disksup)]).