aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_pem_cache_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-06-23 10:08:51 +0200
committerIngela Anderton Andin <[email protected]>2015-06-23 10:08:51 +0200
commit7cff27e14e051b6ee15f564335eb8e685e1639c1 (patch)
treeb97f48f3482bd7f0651acdaab4eba69709a8c88f /lib/ssl/test/ssl_pem_cache_SUITE.erl
parentc57c5c83acb3a21b52304bc53cbdf32e0dda3690 (diff)
parent566cbee917638f596c5d46bd0aff331a66f5c8d2 (diff)
downloadotp-7cff27e14e051b6ee15f564335eb8e685e1639c1.tar.gz
otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.tar.bz2
otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.zip
Merge branch 'ia/ssl/modern-timetrap'
* ia/ssl/modern-timetrap: ssl: Make init functions fail if make_certs:all fails ssl: Avoid sleep ssl: modernize timetrap handling
Diffstat (limited to 'lib/ssl/test/ssl_pem_cache_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_pem_cache_SUITE.erl14
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/ssl/test/ssl_pem_cache_SUITE.erl b/lib/ssl/test/ssl_pem_cache_SUITE.erl
index 1264ac850b..3e96276258 100644
--- a/lib/ssl/test/ssl_pem_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_pem_cache_SUITE.erl
@@ -45,11 +45,8 @@ init_per_suite(Config0) ->
ok ->
ssl:start(),
%% make rsa certs using oppenssl
- Result =
- (catch make_certs:all(?config(data_dir, Config0),
- ?config(priv_dir, Config0))),
- ct:log("Make certs ~p~n", [Result]),
-
+ {ok, _} = make_certs:all(?config(data_dir, Config0),
+ ?config(priv_dir, Config0)),
Config1 = ssl_test_lib:make_dsa_cert(Config0),
ssl_test_lib:cert_options(Config1)
catch _:_ ->
@@ -65,15 +62,16 @@ init_per_group(_GroupName, Config) ->
end_per_group(_GroupName, Config) ->
Config.
-init_per_testcase(pem_cleanup, Config) ->
- ssl:stop(),
+init_per_testcase(pem_cleanup = Case, Config) ->
+ end_per_testcase(Case, Config) ,
application:load(ssl),
application:set_env(ssl, ssl_pem_cache_clean, ?CLEANUP_INTERVAL),
ssl:start(),
+ ct:timetrap({minutes, 1}),
Config.
end_per_testcase(_TestCase, Config) ->
- %%ssl:stop(),
+ ssl:stop(),
Config.
%%--------------------------------------------------------------------