diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-08-10 10:43:58 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-08-10 10:43:58 +0200 |
| commit | 46699596465e9ff49c2c2394311e7899132a2132 (patch) | |
| tree | e6e90e0fe65d9519aa816a9da155f2ec160c7ecc /lib/ssl | |
| parent | 2432649120fd413894b5bb60d8ac864f6632e868 (diff) | |
| download | otp-46699596465e9ff49c2c2394311e7899132a2132.tar.gz otp-46699596465e9ff49c2c2394311e7899132a2132.tar.bz2 otp-46699596465e9ff49c2c2394311e7899132a2132.zip | |
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 8a4d827456..9aa4e8aeb5 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 04c86ccbb6..648fc599d7 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -196,7 +196,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) -> |