aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-08-22 11:06:37 +0200
committerIngela Anderton Andin <[email protected]>2016-08-22 11:06:37 +0200
commit35eb3f107fc75230fdf80dd6c1040c8c4b61f410 (patch)
tree4d2b2a77ec5dc5fa1bbcc57e35116d4137870276
parent74eea0fbb2cb5d0bb211dad19891d2aae31e170d (diff)
parent4ee04136d08b259df55d08add158ed2a5cadb6db (diff)
downloadotp-35eb3f107fc75230fdf80dd6c1040c8c4b61f410.tar.gz
otp-35eb3f107fc75230fdf80dd6c1040c8c4b61f410.tar.bz2
otp-35eb3f107fc75230fdf80dd6c1040c8c4b61f410.zip
Merge branch 'ingela/ssl/ssl_npn_hello_SUITE_precondition' into maint
* ingela/ssl/ssl_npn_hello_SUITE_precondition: ssl: Check precondition for ssl_npn_hello_SUITE
-rw-r--r--lib/ssl/test/ssl_npn_hello_SUITE.erl9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_npn_hello_SUITE.erl b/lib/ssl/test/ssl_npn_hello_SUITE.erl
index 00eb9fee4f..6ae9efe5e9 100644
--- a/lib/ssl/test/ssl_npn_hello_SUITE.erl
+++ b/lib/ssl/test/ssl_npn_hello_SUITE.erl
@@ -41,6 +41,15 @@ all() ->
create_server_hello_with_advertised_protocols_test,
create_server_hello_with_no_advertised_protocols_test].
+init_per_suite(Config) ->
+ catch crypto:stop(),
+ try crypto:start() of
+ ok ->
+ Config
+ catch _:_ ->
+ {skip, "Crypto did not start"}
+ end.
+
init_per_testcase(_TestCase, Config) ->
ssl_test_lib:ct_log_supported_protocol_versions(Config),
ct:timetrap({seconds, 5}),