aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_upgrade_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_upgrade_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_upgrade_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_upgrade_SUITE.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl
index 77804d6b98..17b0240fe8 100644
--- a/lib/ssl/test/ssl_upgrade_SUITE.erl
+++ b/lib/ssl/test/ssl_upgrade_SUITE.erl
@@ -45,10 +45,8 @@ init_per_suite(Config0) ->
{skip, Reason} ->
{skip, Reason};
Config ->
- Result =
- (catch make_certs:all(?config(data_dir, Config),
- ?config(priv_dir, Config))),
- ct:log("Make certs ~p~n", [Result]),
+ {ok, _} = make_certs:all(?config(data_dir, Config),
+ ?config(priv_dir, Config)),
ssl_test_lib:cert_options(Config)
end;
{ok, false} ->
@@ -62,8 +60,11 @@ end_per_suite(Config) ->
crypto:stop().
init_per_testcase(_TestCase, Config) ->
+ ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
+ ct:timetrap({minutes, 1}),
Config.
-end_per_testcase(_TestCase, Config) ->
+
+end_per_testcase(_TestCase, Config) ->
Config.
major_upgrade(Config) when is_list(Config) ->
@@ -162,4 +163,3 @@ is_soft([{restart_application, ssl}]) ->
false;
is_soft(_) ->
true.
-