aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-06-14 12:42:12 +0200
committerIngela Anderton Andin <[email protected]>2016-06-14 12:42:12 +0200
commit704ad32027d4a0b31deb9c61037679b1d0527caa (patch)
treebd99c3cef6728b160ef2e351bb2f1733bc5c52c7 /lib/ssl
parent481ac2a246c53c29033648ae5adda2c215fcc924 (diff)
parentd40e751d3e1edf979209587e0609c3825d66f7c0 (diff)
downloadotp-704ad32027d4a0b31deb9c61037679b1d0527caa.tar.gz
otp-704ad32027d4a0b31deb9c61037679b1d0527caa.tar.bz2
otp-704ad32027d4a0b31deb9c61037679b1d0527caa.zip
Merge branch 'ingela/ssl/ssl_basic_SUITE-timeouts'
* ingela/ssl/ssl_basic_SUITE-timeouts: ssl: Tune timeouts
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 93b6ae66dc..efa5faa218 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -347,10 +347,13 @@ init_per_testcase(TestCase, Config) when TestCase == psk_cipher_suites;
TestCase == psk_with_hint_cipher_suites;
TestCase == ciphers_rsa_signed_certs;
TestCase == ciphers_rsa_signed_certs_openssl_names;
+ TestCase == ciphers_dsa_signed_certs;
+ TestCase == ciphers_dsa_signed_certs_openssl_names;
+ TestCase == anonymous_cipher_suites;
TestCase == versions_option,
TestCase == tls_tcp_connect_big ->
ssl_test_lib:ct_log_supported_protocol_versions(Config),
- ct:timetrap({seconds, 30}),
+ ct:timetrap({seconds, 60}),
Config;
init_per_testcase(rizzo, Config) ->