diff options
| author | Hans Nilsson <[email protected]> | 2016-08-31 10:10:38 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-08-31 10:10:38 +0200 |
| commit | 794c7616a5627fde16b954ffc609149e41429a9f (patch) | |
| tree | 08832441e4eb85501f2173dcb679e7bb4cc2c515 | |
| parent | c4ad47cbd88a3570116b3f60210d6cae2c62f7b5 (diff) | |
| parent | 15843a06e0f08d288b88c2f19c3d23057b45bb9f (diff) | |
| download | otp-794c7616a5627fde16b954ffc609149e41429a9f.tar.gz otp-794c7616a5627fde16b954ffc609149e41429a9f.tar.bz2 otp-794c7616a5627fde16b954ffc609149e41429a9f.zip | |
Merge branch 'maint' of git-server.otp.ericsson.se:otp into maint
| -rw-r--r-- | lib/ssl/test/ssl_crl_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_packet_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_crl_SUITE.erl b/lib/ssl/test/ssl_crl_SUITE.erl index 00636e5660..e37e127440 100644 --- a/lib/ssl/test/ssl_crl_SUITE.erl +++ b/lib/ssl/test/ssl_crl_SUITE.erl @@ -72,7 +72,7 @@ init_per_suite(Config) -> false -> {skip, io_lib:format("Bad openssl version: ~p",[OpenSSL_version])}; _ -> - catch crypto:stop(), + end_per_suite(Config), try crypto:start() of ok -> {ok, Hostname0} = inet:gethostname(), diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl index 193307b347..17237118a0 100644 --- a/lib/ssl/test/ssl_packet_SUITE.erl +++ b/lib/ssl/test/ssl_packet_SUITE.erl @@ -140,6 +140,7 @@ init_per_suite(Config) -> catch crypto:stop(), try crypto:start() of ok -> + ssl:stop(), ssl:start(), {ok, _} = make_certs:all(proplists:get_value(data_dir, Config), proplists:get_value(priv_dir, Config)), @@ -162,6 +163,7 @@ init_per_group(GroupName, Config) -> {skip, "Missing crypto support"} end; _ -> + ssl:stop(), ssl:start(), Config end. diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 86c875b57e..83a4dae0a1 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -116,6 +116,7 @@ init_per_suite(Config0) -> catch crypto:stop(), try crypto:start() of ok -> + ssl:stop(), ssl:start(), {ok, _} = make_certs:all(proplists:get_value(data_dir, Config0), proplists:get_value(priv_dir, Config0)), |