diff options
| author | Lukas Larsson <[email protected]> | 2016-06-14 10:22:40 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-06-14 10:22:40 +0200 |
| commit | 1418cbbb689dc2c88ecceaedb4eba33061d338e7 (patch) | |
| tree | 348257a01f32af0ceb349933c4a7dbe64c884df7 /lib/os_mon | |
| parent | 0c8357d15dd2573331056a308e3744927ce406ad (diff) | |
| parent | 9411a2098d983cac05fd7198bba26b9d56aa484a (diff) | |
| download | otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.tar.gz otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.tar.bz2 otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.zip | |
Merge branch 'lukas/erts/testfixes-19'
* lukas/erts/testfixes-19:
erts: Increase bif and nif call_time trace test
erts: Fix distribution_SUITE:bulk_send_bigbig on windows
erts: Ensure bs_add_overflow test has enough memory
kernel: Better explain controlling_process' tcp behaviour
kernel: Fix t_recv_delim on bsd
os_mon: Make sure to start/stop os_mon in tests correctly
ssl: Fix use_interface dist_SSL test
erl_interface: Fix signed int overflow tc bug
erts: fix atom_roundtrip_r15b tc
erts: Require more memory for debug tests
Diffstat (limited to 'lib/os_mon')
| -rw-r--r-- | lib/os_mon/test/cpu_sup_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/os_mon/test/os_mon_SUITE.erl | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/os_mon/test/cpu_sup_SUITE.erl b/lib/os_mon/test/cpu_sup_SUITE.erl index 41115ee6e2..7122d23503 100644 --- a/lib/os_mon/test/cpu_sup_SUITE.erl +++ b/lib/os_mon/test/cpu_sup_SUITE.erl @@ -256,7 +256,7 @@ unavailable(Config) when is_list(Config) -> restart(Config) when is_list(Config) -> ok = application:set_env(os_mon, start_cpu_sup, true), - {ok, _Pid} = supervisor:restart_child(os_mon_sup, cpu_sup), + supervisor:restart_child(os_mon_sup, cpu_sup), ok. %% Aux diff --git a/lib/os_mon/test/os_mon_SUITE.erl b/lib/os_mon/test/os_mon_SUITE.erl index 033a5ae162..c373b5d851 100644 --- a/lib/os_mon/test/os_mon_SUITE.erl +++ b/lib/os_mon/test/os_mon_SUITE.erl @@ -21,7 +21,7 @@ -include_lib("common_test/include/ct.hrl"). %% Test server specific exports --export([all/0, suite/0]). +-export([all/0, suite/0, init_per_suite/1, end_per_suite/1]). %% Test cases -export([app_file/1, appup_file/1, config/1]). @@ -36,6 +36,13 @@ all() -> _OS -> [app_file, appup_file] end. +init_per_suite(Config) -> + Config. + +end_per_suite(_Config) -> + application:stop(os_mon), + ok. + %% Testing .app file app_file(Config) when is_list(Config) -> ok = test_server:app_test(os_mon), |