diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-08-14 11:06:17 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-08-14 11:06:17 +0200 |
| commit | 95b567a7286a1e94bc799c6817f7bf8d5c52fe41 (patch) | |
| tree | e1bf64d950e2e64e8c6dcb1e1652a2d011ec13f7 /lib/ssl | |
| parent | 5322f7cf67498f364d053fd7c49c0c5858f1d0fa (diff) | |
| parent | 46699596465e9ff49c2c2394311e7899132a2132 (diff) | |
| download | otp-95b567a7286a1e94bc799c6817f7bf8d5c52fe41.tar.gz otp-95b567a7286a1e94bc799c6817f7bf8d5c52fe41.tar.bz2 otp-95b567a7286a1e94bc799c6817f7bf8d5c52fe41.zip | |
Merge branch 'ingela/ssl/timeout-cuddle' into maint
* ingela/ssl/timeout-cuddle:
ssl: Longer timeouts for test cases that do many handshakes
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 5 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 12d255a5bc..aeb4897d7e 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -370,6 +370,11 @@ init_per_testcase(TestCase, Config) when TestCase == psk_cipher_suites; TestCase == anonymous_cipher_suites; TestCase == psk_anon_cipher_suites; TestCase == psk_anon_with_hint_cipher_suites; + TestCase == srp_cipher_suites, + TestCase == srp_anon_cipher_suites, + TestCase == srp_dsa_cipher_suites, + TestCase == des_rsa_cipher_suites, + TestCase == des_ecdh_rsa_cipher_suites, TestCase == versions_option, TestCase == tls_tcp_connect_big -> ssl_test_lib:ct_log_supported_protocol_versions(Config), diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index a14007640a..c9a1b8c735 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -195,7 +195,7 @@ 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, 45}), + ct:timetrap({seconds, 60}), special_init(TestCase, Config); init_per_testcase(TestCase, Config) -> |