aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-05-23 08:32:41 +0200
committerIngela Anderton Andin <[email protected]>2018-05-23 08:32:41 +0200
commite30436394466007826456fa8dfc802c16bcfbdbb (patch)
treea793448753ac2bcdf598af4dd726f4cc8cb3b065 /lib/ssl/test/ssl_ECC_openssl_SUITE.erl
parent9c8fd09de0f7132faa06375f5fd35431c5027866 (diff)
parent8aa37e9a7a086076368b26ca9517dfe6bb86732b (diff)
downloadotp-e30436394466007826456fa8dfc802c16bcfbdbb.tar.gz
otp-e30436394466007826456fa8dfc802c16bcfbdbb.tar.bz2
otp-e30436394466007826456fa8dfc802c16bcfbdbb.zip
Merge branch 'ingela/ssl/openssl-test-cuddle'
* ingela/ssl/openssl-test-cuddle: ssl: anon test should use dh or ecdh anon keyexchange ssl: Cuddle no delivery guarantee at application level ssl: Cuddle timeout ssl: Correct option handling to OpenSSL
Diffstat (limited to 'lib/ssl/test/ssl_ECC_openssl_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_ECC_openssl_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
index 280fa94ecb..5a08b152a6 100644
--- a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
@@ -157,7 +157,7 @@ init_per_testcase(TestCase, Config) ->
ct:log("Ciphers: ~p~n ", [ssl:cipher_suites(default, Version)]),
end_per_testcase(TestCase, Config),
ssl:start(),
- ct:timetrap({seconds, 15}),
+ ct:timetrap({seconds, 30}),
Config.
end_per_testcase(_TestCase, Config) ->