diff options
author | Ingela Anderton Andin <[email protected]> | 2018-01-11 11:51:14 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-01-11 11:51:14 +0100 |
commit | 56a7fbfbaed864392ace346889f0a9300cf631cd (patch) | |
tree | 9d826bee671e9368f37c2ea9be7added0929d2bf /lib/ssl/test/ssl_to_openssl_SUITE.erl | |
parent | ad72a944c03095c3505cb151c9a93d243fb698b6 (diff) | |
parent | e9b753a03b7f0edc6f795e9c05cd3cca41c2011e (diff) | |
download | otp-56a7fbfbaed864392ace346889f0a9300cf631cd.tar.gz otp-56a7fbfbaed864392ace346889f0a9300cf631cd.tar.bz2 otp-56a7fbfbaed864392ace346889f0a9300cf631cd.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_to_openssl_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 9118e4b7e3..bbb925e742 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -201,11 +201,11 @@ init_per_testcase(expired_session, Config) -> init_per_testcase(TestCase, Config) when TestCase == ciphers_rsa_signed_certs; TestCase == ciphers_dsa_signed_certs -> - ct:timetrap({seconds, 60}), + ct:timetrap({seconds, 90}), special_init(TestCase, Config); init_per_testcase(TestCase, Config) -> - ct:timetrap({seconds, 20}), + ct:timetrap({seconds, 35}), special_init(TestCase, Config). special_init(TestCase, Config) |