diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-07-03 09:35:21 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-07-03 09:35:21 +0200 |
| commit | 51668da86a591681f230e76e4947249e318522a1 (patch) | |
| tree | 8ab40386866a52430ec87e3c2e410b56b7e8aced /lib/ssl/test/ssl_ECC_SUITE.erl | |
| parent | 92a0cf0cafb20181982554d9a95247c86f9db4e4 (diff) | |
| parent | 37c12e0025c69bbcd19c4fa149a4c088c2181eed (diff) | |
| download | otp-51668da86a591681f230e76e4947249e318522a1.tar.gz otp-51668da86a591681f230e76e4947249e318522a1.tar.bz2 otp-51668da86a591681f230e76e4947249e318522a1.zip | |
Merge branch 'ia/ssl/tune-tests' into maint
* ia/ssl/tune-tests:
ssl: Exclude broken OpenSSL version from ECC test
ssl: Tune timeouts
Diffstat (limited to 'lib/ssl/test/ssl_ECC_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index 6ea0466dde..85152fda22 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -143,7 +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}), + ct:timetrap({seconds, 15}), Config. end_per_testcase(_TestCase, Config) -> |