diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-03-21 17:49:05 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-03-21 19:34:27 +0100 |
| commit | ddda2ac2b524c7bf4ae6a357faac4f73c20ebca9 (patch) | |
| tree | 77c9cf13f18727480c37bc27f9ea751dd4be1fbb /lib/erl_interface/test/erl_global_SUITE.erl | |
| parent | a94361075998359469c8f2130d2ba64f2d7fcb25 (diff) | |
| download | otp-ddda2ac2b524c7bf4ae6a357faac4f73c20ebca9.tar.gz otp-ddda2ac2b524c7bf4ae6a357faac4f73c20ebca9.tar.bz2 otp-ddda2ac2b524c7bf4ae6a357faac4f73c20ebca9.zip | |
Modernize timetraps
Diffstat (limited to 'lib/erl_interface/test/erl_global_SUITE.erl')
| -rw-r--r-- | lib/erl_interface/test/erl_global_SUITE.erl | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/lib/erl_interface/test/erl_global_SUITE.erl b/lib/erl_interface/test/erl_global_SUITE.erl index e239c78040..955ffb6a9f 100644 --- a/lib/erl_interface/test/erl_global_SUITE.erl +++ b/lib/erl_interface/test/erl_global_SUITE.erl @@ -24,9 +24,9 @@ -include_lib("common_test/include/ct.hrl"). -include("erl_global_SUITE_data/erl_global_test_cases.hrl"). --export([all/0,suite/0,init_per_suite/1,end_per_suite/1, - init_per_testcase/2,end_per_testcase/2, - erl_global_registration/1, erl_global_whereis/1, erl_global_names/1]). +-export([all/0,suite/0, + erl_global_registration/1, + erl_global_whereis/1, erl_global_names/1]). -import(runner, [get_term/1,send_term/2]). @@ -35,22 +35,10 @@ all() -> [erl_global_registration, erl_global_whereis, erl_global_names]. -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap, {seconds, 30}}]. -init_per_suite(Config) -> - Config. - -end_per_suite(_Config) -> - ok. - -init_per_testcase(_Case, Config) -> - Dog = ?t:timetrap(?t:minutes(0.25)), - [{watchdog, Dog}|Config]. - -end_per_testcase(_Case, Config) -> - Dog = ?config(watchdog, Config), - test_server:timetrap_cancel(Dog), - ok. erl_global_registration(Config) when is_list(Config) -> P = runner:start(?interpret), |