diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-01-11 11:50:45 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-01-11 11:50:45 +0100 |
| commit | e9b753a03b7f0edc6f795e9c05cd3cca41c2011e (patch) | |
| tree | 5c3df396e1fc6ce049c01a0328adc7f12a94e87f /lib/ssl/test/ssl_to_openssl_SUITE.erl | |
| parent | df8499995b4994d3f85f4b80fc3c2cf941a99cdc (diff) | |
| parent | f4b1cfb4b0e750664d56f1a842a4bde09f18b6f9 (diff) | |
| download | otp-e9b753a03b7f0edc6f795e9c05cd3cca41c2011e.tar.gz otp-e9b753a03b7f0edc6f795e9c05cd3cca41c2011e.tar.bz2 otp-e9b753a03b7f0edc6f795e9c05cd3cca41c2011e.zip | |
Merge branch 'ingela/ssl/timeout-cuddle' into maint
* ingela/ssl/timeout-cuddle:
ssl: Tune timeouts
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) |