diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-08-22 11:08:01 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-08-22 11:08:01 +0200 |
| commit | f1c1501bd6433b97615055dec53ae3739b6e3691 (patch) | |
| tree | 388caad8feced9746a607e93f1ec3c1d4bcfdeba | |
| parent | 04e925591e26c25fcdf8185324664135378f9291 (diff) | |
| parent | 35eb3f107fc75230fdf80dd6c1040c8c4b61f410 (diff) | |
| download | otp-f1c1501bd6433b97615055dec53ae3739b6e3691.tar.gz otp-f1c1501bd6433b97615055dec53ae3739b6e3691.tar.bz2 otp-f1c1501bd6433b97615055dec53ae3739b6e3691.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/test/ssl_npn_hello_SUITE.erl | 9 |
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}), |