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_session_cache_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_session_cache_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_session_cache_SUITE.erl | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl index 3501d7e120..1ae734c799 100644 --- a/lib/ssl/test/ssl_session_cache_SUITE.erl +++ b/lib/ssl/test/ssl_session_cache_SUITE.erl @@ -50,7 +50,6 @@ groups() -> []. init_per_suite(Config0) -> - Dog = ct:timetrap(?LONG_TIMEOUT *2), catch crypto:stop(), try crypto:start() of ok -> @@ -61,9 +60,8 @@ init_per_suite(Config0) -> ?config(priv_dir, Config0))), ct:log("Make certs ~p~n", [Result]), - Config1 = ssl_test_lib:make_dsa_cert(Config0), - Config = ssl_test_lib:cert_options(Config1), - [{watchdog, Dog} | Config] + Config = ssl_test_lib:make_dsa_cert(Config0), + ssl_test_lib:cert_options(Config) catch _:_ -> {skip, "Crypto did not start"} end. @@ -85,24 +83,20 @@ init_per_testcase(session_cache_process_mnesia, Config) -> mnesia:start(), init_customized_session_cache(mnesia, Config); -init_per_testcase(session_cleanup, Config0) -> - Config = lists:keydelete(watchdog, 1, Config0), - Dog = ct:timetrap(?TIMEOUT), +init_per_testcase(session_cleanup, Config) -> ssl:stop(), application:load(ssl), application:set_env(ssl, session_lifetime, 5), application:set_env(ssl, session_delay_cleanup_time, ?DELAY), ssl:start(), - [{watchdog, Dog} | Config]; + ct:timetrap({seconds, 20}), + Config; -init_per_testcase(_TestCase, Config0) -> - Config = lists:keydelete(watchdog, 1, Config0), - Dog = ct:timetrap(?TIMEOUT), - [{watchdog, Dog} | Config]. +init_per_testcase(_TestCase, Config) -> + ct:timetrap({seconds, 5}), + Config. -init_customized_session_cache(Type, Config0) -> - Config = lists:keydelete(watchdog, 1, Config0), - Dog = ct:timetrap(?TIMEOUT), +init_customized_session_cache(Type, Config) -> ssl:stop(), application:load(ssl), application:set_env(ssl, session_cb, ?MODULE), @@ -112,7 +106,8 @@ init_customized_session_cache(Type, Config0) -> Config)), ets:new(ssl_test, [named_table, public, set]), ets:insert(ssl_test, {type, Type}), - [{watchdog, Dog} | Config]. + ct:timetrap({seconds, 5}), + Config. end_per_testcase(session_cache_process_list, Config) -> application:unset_env(ssl, session_cb), |