aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-09-06 11:14:33 +0200
committerIngela Anderton Andin <[email protected]>2016-09-06 11:14:33 +0200
commit751658c435c49eb552da115fe9348bee6b98ccfe (patch)
tree037f7c869d033df3cd7c30a167892eeb0aa97233
parentaf1e8c27b269c8750ed976ce8667967798f429e8 (diff)
parentdd2919dc29d3eb0d287522c7485bf42343173937 (diff)
downloadotp-751658c435c49eb552da115fe9348bee6b98ccfe.tar.gz
otp-751658c435c49eb552da115fe9348bee6b98ccfe.tar.bz2
otp-751658c435c49eb552da115fe9348bee6b98ccfe.zip
Merge branch 'maint'
-rw-r--r--lib/ssl/test/ssl_to_openssl_SUITE.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 06f419f8c6..9ae032503a 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -120,6 +120,10 @@ init_per_suite(Config0) ->
try crypto:start() of
ok ->
ssl:stop(),
+ application:load(ssl),
+ ct:pal("Before clean: Version: ~p", [ssl:versions()]),
+ application:unset_env(ssl, protocol_version),
+ ct:pal("After clean: Version: ~p", [ssl:versions()]),
ssl:start(),
{ok, _} = make_certs:all(proplists:get_value(data_dir, Config0),
proplists:get_value(priv_dir, Config0)),