diff options
| author | Kenneth Lundin <[email protected]> | 2011-03-08 17:26:32 +0100 |
|---|---|---|
| committer | Kenneth Lundin <[email protected]> | 2011-03-08 17:26:32 +0100 |
| commit | 00eac4ea859ea5cade4942dc8219355d7bca6149 (patch) | |
| tree | 6504c7b5cb148ee9e7defc6fa677271c9f8c10e1 /lib/ssl/test/ssl_session_cache_SUITE.erl | |
| parent | 26d701c1c334d41a43712b71c11d61995cecd279 (diff) | |
| parent | dea83e25a671b0bc2661582c3227c1728d69bfea (diff) | |
| download | otp-00eac4ea859ea5cade4942dc8219355d7bca6149.tar.gz otp-00eac4ea859ea5cade4942dc8219355d7bca6149.tar.bz2 otp-00eac4ea859ea5cade4942dc8219355d7bca6149.zip | |
Merge branch 'dev' of super:otp into dev
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. |