diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-10-14 16:17:48 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-10-14 16:17:48 +0200 |
| commit | 74adb848a89eb9eb4be52e8d46e1c07e52e65f20 (patch) | |
| tree | c6d08322b44f35c82f75e73405635fa1e8b74d46 /lib/ssl | |
| parent | df8c6690a86d087d8de324276b2266bc5918c779 (diff) | |
| parent | 309f17c4e95d51dac0c87f9faa419f96ea303dee (diff) | |
| download | otp-74adb848a89eb9eb4be52e8d46e1c07e52e65f20.tar.gz otp-74adb848a89eb9eb4be52e8d46e1c07e52e65f20.tar.bz2 otp-74adb848a89eb9eb4be52e8d46e1c07e52e65f20.zip | |
Merge branch 'ingela/ssl/tune-timeouts-basic_SUITE' into maint
* ingela/ssl/tune-timeouts-basic_SUITE:
ssl: Tune timeout for old solaris machine
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 322f93b94c..1be43c56c4 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -364,6 +364,16 @@ init_per_testcase(TestCase, Config) when TestCase == psk_cipher_suites; ct:timetrap({seconds, 60}), Config; +init_per_testcase(version_option, Config) -> + ssl_test_lib:ct_log_supported_protocol_versions(Config), + ct:timetrap({seconds, 10}), + Config; + +init_per_testcase(reuse_session, Config) -> + ssl_test_lib:ct_log_supported_protocol_versions(Config), + ct:timetrap({seconds, 10}), + Config; + init_per_testcase(rizzo, Config) -> ssl_test_lib:ct_log_supported_protocol_versions(Config), ct:timetrap({seconds, 40}), |