diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-06-23 10:08:51 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-06-23 10:08:51 +0200 |
| commit | 7cff27e14e051b6ee15f564335eb8e685e1639c1 (patch) | |
| tree | b97f48f3482bd7f0651acdaab4eba69709a8c88f /lib/ssl/test/ssl_ECC_SUITE.erl | |
| parent | c57c5c83acb3a21b52304bc53cbdf32e0dda3690 (diff) | |
| parent | 566cbee917638f596c5d46bd0aff331a66f5c8d2 (diff) | |
| download | otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.tar.gz otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.tar.bz2 otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.zip | |
Merge branch 'ia/ssl/modern-timetrap'
* ia/ssl/modern-timetrap:
ssl: Make init functions fail if make_certs:all fails
ssl: Avoid sleep
ssl: modernize timetrap handling
Diffstat (limited to 'lib/ssl/test/ssl_ECC_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index db767908be..6ea0466dde 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -71,10 +71,8 @@ init_per_suite(Config0) -> try crypto:start() of ok -> %% make rsa certs using oppenssl - Result = - (catch make_certs:all(?config(data_dir, Config0), - ?config(priv_dir, Config0))), - ct:log("Make certs ~p~n", [Result]), + {ok, _} = make_certs:all(?config(data_dir, Config0), + ?config(priv_dir, Config0)), Config1 = ssl_test_lib:make_ecdsa_cert(Config0), Config2 = ssl_test_lib:make_ecdh_rsa_cert(Config1), ssl_test_lib:cert_options(Config2) @@ -145,6 +143,7 @@ init_per_testcase(TestCase, Config) -> ct:log("Ciphers: ~p~n ", [ ssl:cipher_suites()]), end_per_testcase(TestCase, Config), ssl:start(), + ct:timetrap({seconds, 5}), Config. end_per_testcase(_TestCase, Config) -> @@ -246,7 +245,6 @@ start_server(openssl, CA, OwnCa, Cert, Key, Config) -> " -verify 2 -cert " ++ Cert ++ " -CAfile " ++ NewCA ++ " -key " ++ Key ++ " -msg -debug", OpenSslPort = open_port({spawn, Cmd}, [stderr_to_stdout]), - ssl_test_lib:wait_for_openssl_server(), true = port_command(OpenSslPort, "Hello world"), {OpenSslPort, Port}; |