diff options
author | Ingela Anderton Andin <[email protected]> | 2015-07-03 09:37:30 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-07-03 09:37:30 +0200 |
commit | 726b27a4bac120d251f090748b7ea24131324bbb (patch) | |
tree | 26614485842dec65ddc40e9d9b39e881edc1a357 /lib/ssl/test/ssl_ECC_SUITE.erl | |
parent | 3a713298daaaee9156d0819e74fc6b7cdeb8cddc (diff) | |
parent | 51668da86a591681f230e76e4947249e318522a1 (diff) | |
download | otp-726b27a4bac120d251f090748b7ea24131324bbb.tar.gz otp-726b27a4bac120d251f090748b7ea24131324bbb.tar.bz2 otp-726b27a4bac120d251f090748b7ea24131324bbb.zip |
Merge branch 'maint'
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) -> |