diff options
author | Ingela Anderton Andin <ingela@erlang.org> | 2021-02-12 14:16:39 +0100 |
---|---|---|
committer | Ingela Anderton Andin <ingela@erlang.org> | 2021-02-12 14:16:39 +0100 |
commit | 6c238977764f804eb793ea075961f81d0d2b584c (patch) | |
tree | 0a0544203634a12dba26443beb855b417964657a /lib/ssl/test/openssl_cipher_suite_SUITE.erl | |
parent | 4b607f92b743c3e03e4864f753b79ded60e39bb1 (diff) | |
parent | 36a5a73d6776685c20035835d5635176f0dbadbb (diff) | |
download | erlang-6c238977764f804eb793ea075961f81d0d2b584c.tar.gz |
Merge branch 'ingela/ssl/cuddle-timeouts-and-versions' into maint
* ingela/ssl/cuddle-timeouts-and-versions:
ssl: Cuddle tests
Diffstat (limited to 'lib/ssl/test/openssl_cipher_suite_SUITE.erl')
-rw-r--r-- | lib/ssl/test/openssl_cipher_suite_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/openssl_cipher_suite_SUITE.erl b/lib/ssl/test/openssl_cipher_suite_SUITE.erl index fc17827a1b..fb1f28aa4a 100644 --- a/lib/ssl/test/openssl_cipher_suite_SUITE.erl +++ b/lib/ssl/test/openssl_cipher_suite_SUITE.erl @@ -89,7 +89,7 @@ ecdhe_ecdsa_with_aes_256_ccm_8/1 ]). --define(DEFAULT_TIMEOUT, {seconds, 6}). +-define(DEFAULT_TIMEOUT, {seconds, 10}). %%-------------------------------------------------------------------- %% Common Test interface functions ----------------------------------- @@ -388,7 +388,7 @@ init_per_testcase(TestCase, Config) when TestCase == psk_3des_ede_cbc; SupCiphers = proplists:get_value(ciphers, crypto:supports()), case lists:member(des_ede3, SupCiphers) of true -> - ct:timetrap({seconds, 5}), + ct:timetrap({seconds, ?DEFAULT_TIMEOUT}), Config; _ -> {skip, "Missing 3DES crypto support"} |