diff options
| author | Lukas Larsson <[email protected]> | 2010-10-12 10:50:23 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-02-17 17:28:28 +0100 |
| commit | cbd5fd9daadf1f46c718774732a65cf830b64f94 (patch) | |
| tree | cb1bc4d41fb4ab2a737852fad69bb614ed793b49 | |
| parent | 17637a1353c6be871d4fc4cc17f70b012eebc254 (diff) | |
| download | otp-cbd5fd9daadf1f46c718774732a65cf830b64f94.tar.gz otp-cbd5fd9daadf1f46c718774732a65cf830b64f94.tar.bz2 otp-cbd5fd9daadf1f46c718774732a65cf830b64f94.zip | |
Update epmd tests to conform with common_test standard
| -rw-r--r-- | erts/epmd/test/epmd.spec | 2 | ||||
| -rw-r--r-- | erts/epmd/test/epmd_SUITE.erl | 67 |
2 files changed, 27 insertions, 42 deletions
diff --git a/erts/epmd/test/epmd.spec b/erts/epmd/test/epmd.spec index 0e2496bc72..d77bc4afb9 100644 --- a/erts/epmd/test/epmd.spec +++ b/erts/epmd/test/epmd.spec @@ -1 +1 @@ -{topcase, {dir, "../epmd_test"}}. +{suites,"epmd_test",all}. diff --git a/erts/epmd/test/epmd_SUITE.erl b/erts/epmd/test/epmd_SUITE.erl index da69412e12..e45d574ac0 100644 --- a/erts/epmd/test/epmd_SUITE.erl +++ b/erts/epmd/test/epmd_SUITE.erl @@ -17,7 +17,7 @@ %% %CopyrightEnd% %% -module(epmd_SUITE). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include_lib("kernel/include/file.hrl"). @@ -35,7 +35,7 @@ -record(node_info, {port, node_type, prot, lvsn, hvsn, node_name, extra}). % Test server specific exports --export([all/1, init_per_testcase/2, fin_per_testcase/2]). +-export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, fin_per_testcase/2]). -export( [ @@ -64,7 +64,7 @@ returns_valid_empty_extra/1, returns_valid_populated_extra_with_nulls/1, - buffer_overrun/1, + buffer_overrun_1/1, buffer_overrun_2/1, no_nonlocal_register/1, @@ -101,42 +101,29 @@ %% all/1 %% -all(suite) -> - [ - register_name, - register_names_1, - register_names_2, - register_duplicate_name, - get_port_nr, - slow_get_port_nr, - unregister_others_name_1, - unregister_others_name_2, - register_overflow, - name_with_null_inside, - name_null_terminated, - stupid_names_req, - - no_data, - one_byte, - two_bytes, - partial_packet, - zero_length, - too_large, - alive_req_too_small_1, - alive_req_too_small_2, - alive_req_too_large, - - returns_valid_empty_extra, - returns_valid_populated_extra_with_nulls, - - buffer_overrun, - %buffer_overrun_1, - %buffer_overrun_2, - - no_nonlocal_register, - no_nonlocal_kill, - no_live_killing - ]. +all() -> +[register_name, register_names_1, register_names_2, + register_duplicate_name, get_port_nr, slow_get_port_nr, + unregister_others_name_1, unregister_others_name_2, + register_overflow, name_with_null_inside, + name_null_terminated, stupid_names_req, no_data, + one_byte, two_bytes, partial_packet, zero_length, + too_large, alive_req_too_small_1, alive_req_too_small_2, + alive_req_too_large, returns_valid_empty_extra, + returns_valid_populated_extra_with_nulls, + {group, buffer_overrun}, no_nonlocal_register, + no_nonlocal_kill, no_live_killing]. + +groups() -> + [{buffer_overrun, [], + [buffer_overrun_1, buffer_overrun_2]}]. + +init_per_group(_GroupName, Config) -> + Config. + +end_per_group(_GroupName, Config) -> + Config. + %% %% Run before and after each test case @@ -725,8 +712,6 @@ returns_valid_populated_extra_with_nulls(Config) when is_list(Config) -> ok. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -buffer_overrun(suite) -> - [buffer_overrun_1,buffer_overrun_2]. buffer_overrun_1(suite) -> []; |