diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-06-17 16:47:06 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-06-22 16:02:57 +0200 |
| commit | 287ab39e946b4578d755038989ad50ccfb95f575 (patch) | |
| tree | 71e45c64337a001f7674b308fd20e101d8d49d1b /lib/ssl/test/ssl_dist_SUITE.erl | |
| parent | 2be7b33f26fc950c2f807e1f9fbc19fde83facd0 (diff) | |
| download | otp-287ab39e946b4578d755038989ad50ccfb95f575.tar.gz otp-287ab39e946b4578d755038989ad50ccfb95f575.tar.bz2 otp-287ab39e946b4578d755038989ad50ccfb95f575.zip | |
ssl: modernize timetrap handling
Watchdog is legacy test_server use only ct:timetrap/1
Diffstat (limited to 'lib/ssl/test/ssl_dist_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_dist_SUITE.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl index 5a6556ffb8..a843236015 100644 --- a/lib/ssl/test/ssl_dist_SUITE.erl +++ b/lib/ssl/test/ssl_dist_SUITE.erl @@ -86,17 +86,15 @@ init_per_testcase(Case, Config) when is_list(Config) -> common_init(Case, Config). common_init(Case, Config) -> - Dog = ?t:timetrap(?t:seconds(?DEFAULT_TIMETRAP_SECS)), - [{watchdog, Dog},{testcase, Case}|Config]. + ct:timetrap({seconds, ?DEFAULT_TIMETRAP_SECS}), + [{testcase, Case}|Config]. end_per_testcase(Case, Config) when is_list(Config) -> Flags = proplists:get_value(old_flags, Config), catch os:putenv("ERL_FLAGS", Flags), common_end(Case, Config). -common_end(_, Config) -> - Dog = ?config(watchdog, Config), - ?t:timetrap_cancel(Dog), +common_end(_, _Config) -> ok. %%-------------------------------------------------------------------- |