diff options
author | Micael Karlberg <[email protected]> | 2011-03-07 15:43:06 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-03-07 15:43:06 +0100 |
commit | 5c8338fcadd68589814a7098e001b036109c5ee7 (patch) | |
tree | 4a89c1feb52b8ec862cfa46c8b502ea3880217be /lib/ssl/test/ssl_session_cache_SUITE.erl | |
parent | f39098ac6f487f7142e4597930ee3bb709362c4a (diff) | |
parent | f85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff) | |
download | otp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.gz otp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.bz2 otp-5c8338fcadd68589814a7098e001b036109c5ee7.zip |
Merge branch 'dev' into bmk/inets/httpd/dont_send_empty_chunk/OTP-9091
Diffstat (limited to 'lib/ssl/test/ssl_session_cache_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_session_cache_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl index b47efe0941..a43b9ab586 100644 --- a/lib/ssl/test/ssl_session_cache_SUITE.erl +++ b/lib/ssl/test/ssl_session_cache_SUITE.erl @@ -47,7 +47,7 @@ %%-------------------------------------------------------------------- init_per_suite(Config0) -> Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2), - case application:start(crypto) of + try crypto:start() of ok -> application:start(public_key), ssl:start(), @@ -60,8 +60,8 @@ init_per_suite(Config0) -> Config1 = ssl_test_lib:make_dsa_cert(Config0), Config = ssl_test_lib:cert_options(Config1), - [{watchdog, Dog} | Config]; - _ -> + [{watchdog, Dog} | Config] + catch _:_ -> {skip, "Crypto did not start"} end. |