diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-04-05 16:47:27 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-04-05 16:47:27 +0200 |
| commit | 120a586a5d7d13e0d022dd773537856d30482e1e (patch) | |
| tree | 211ea0fcfc8daa620165248ab4cd1bb67f61832e /erts/test/run_erl_SUITE.erl | |
| parent | 6b17c34656457bf0da708f5c719adabbbd0a00cf (diff) | |
| download | otp-120a586a5d7d13e0d022dd773537856d30482e1e.tar.gz otp-120a586a5d7d13e0d022dd773537856d30482e1e.tar.bz2 otp-120a586a5d7d13e0d022dd773537856d30482e1e.zip | |
Modernize use of timetraps
Diffstat (limited to 'erts/test/run_erl_SUITE.erl')
| -rw-r--r-- | erts/test/run_erl_SUITE.erl | 46 |
1 files changed, 11 insertions, 35 deletions
diff --git a/erts/test/run_erl_SUITE.erl b/erts/test/run_erl_SUITE.erl index 1602466f05..f31f76b8bc 100644 --- a/erts/test/run_erl_SUITE.erl +++ b/erts/test/run_erl_SUITE.erl @@ -20,43 +20,19 @@ -module(run_erl_SUITE). --export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, - init_per_group/2,end_per_group/2, - init_per_testcase/2,end_per_testcase/2, - basic/1,heavy/1,heavier/1,defunct/1]). +-export([all/0, suite/0]). +-export([basic/1,heavy/1,heavier/1,defunct/1]). -export([ping_me_back/1]). -include_lib("common_test/include/ct.hrl"). -init_per_testcase(_Case, Config) -> - Dog = ?t:timetrap(?t:minutes(2)), - [{watchdog, Dog}|Config]. - -end_per_testcase(_Case, Config) -> - Dog = ?config(watchdog, Config), - ?t:timetrap_cancel(Dog), - ok. - -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap, {minutes, 2}}]. all() -> [basic, heavy, heavier, defunct]. -groups() -> - []. - -init_per_suite(Config) -> - Config. - -end_per_suite(_Config) -> - ok. - -init_per_group(_GroupName, Config) -> - Config. - -end_per_group(_GroupName, Config) -> - Config. - basic(Config) when is_list(Config) -> case os:type() of @@ -103,12 +79,12 @@ heavy_1(Config) -> end, case count_new_lines(ToErl, 0) of - Nls when Nls > 30000 -> - ok; - Nls -> - io:format("new_lines: ~p\n", [Nls]), - ?t:fail() - end. + Nls when Nls > 30000 -> + ok; + Nls -> + io:format("new_lines: ~p\n", [Nls]), + ?t:fail() + end. ping_me_back([Node]) when is_atom(Node) -> |