diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-04-01 17:43:39 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-04-01 17:43:39 +0200 |
| commit | 400d41eda5eca53b6b752c5b442d0f548266ce23 (patch) | |
| tree | 4d2f1022071d3ccf70d4c3959236a6c00f2f71af /lib/os_mon/test/os_mon_mib_SUITE.erl | |
| parent | 5d8ec8313876352d128c2fb6e368b77e85b479f0 (diff) | |
| download | otp-400d41eda5eca53b6b752c5b442d0f548266ce23.tar.gz otp-400d41eda5eca53b6b752c5b442d0f548266ce23.tar.bz2 otp-400d41eda5eca53b6b752c5b442d0f548266ce23.zip | |
Modernize use of timetraps
Diffstat (limited to 'lib/os_mon/test/os_mon_mib_SUITE.erl')
| -rw-r--r-- | lib/os_mon/test/os_mon_mib_SUITE.erl | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/lib/os_mon/test/os_mon_mib_SUITE.erl b/lib/os_mon/test/os_mon_mib_SUITE.erl index f966e5ec58..4927389a58 100644 --- a/lib/os_mon/test/os_mon_mib_SUITE.erl +++ b/lib/os_mon/test/os_mon_mib_SUITE.erl @@ -35,9 +35,8 @@ -include_lib("snmp/include/snmp_types.hrl"). % Test server specific exports --export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, - init_per_suite/1, end_per_suite/1, - init_per_testcase/2, end_per_testcase/2]). +-export([all/0, suite/0, groups/0, + init_per_suite/1, end_per_suite/1]). % Test cases must be exported. @@ -53,7 +52,6 @@ large_erl_process_mem64/1, disk_descr/1, disk_kbytes/1, disk_capacity/1]). --export([]). -export([otp_6351/1, otp_7441/1]). -define(TRAP_UDP, 5000). @@ -65,17 +63,11 @@ -define(MGR_PORT, 5001). %%--------------------------------------------------------------------- -init_per_testcase(_Case, Config) when is_list(Config) -> - Dog = test_server:timetrap(test_server:minutes(6)), - [{watchdog, Dog}|Config]. -end_per_testcase(_Case, Config) when is_list(Config) -> - Dog = ?config(watchdog, Config), - test_server:timetrap_cancel(Dog), - Config. - -suite() -> [{ct_hooks,[ts_install_cth]}, - {require, snmp_mgr_agent, snmp}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,6}}, + {require, snmp_mgr_agent, snmp}]. all() -> [load_unload, get_mem_sys_mark, get_mem_proc_mark, @@ -94,12 +86,6 @@ groups() -> {get_next_disk_table, [], [disk_descr, disk_kbytes, disk_capacity]}]. -init_per_group(_GroupName, Config) -> - Config. - -end_per_group(_GroupName, Config) -> - Config. - %%--------------------------------------------------------------------- %%-------------------------------------------------------------------- @@ -198,8 +184,6 @@ otp_6351(Config) when is_list(Config) -> ok. - - %%--------------------------------------------------------------------- get_mem_sys_mark(doc) -> ["Simulates a get call to test the instrumentation function " |