aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-06-29 09:42:07 +0200
committerIngela Anderton Andin <[email protected]>2017-06-29 09:42:07 +0200
commit4dbee101c93ed9498411a116e57919c7e17b077d (patch)
tree39b6d681a2a6c9b8ebcf89b3fe03b0870d5ae1eb
parentbbc8eb42959740930902b68d9a76fad424ca2e6a (diff)
parent32bd68aa22ace6f21306cff6e7fb35b8310fd105 (diff)
downloadotp-4dbee101c93ed9498411a116e57919c7e17b077d.tar.gz
otp-4dbee101c93ed9498411a116e57919c7e17b077d.tar.bz2
otp-4dbee101c93ed9498411a116e57919c7e17b077d.zip
Merge branch 'ingela/ssl/timeout-cuddle' into maint
* ingela/ssl/timeout-cuddle: ssl: Set rizzo* test timeout high enough for our slowest test machine
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 64f9927901..8a4d827456 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -388,22 +388,27 @@ init_per_testcase(reuse_session, Config) ->
init_per_testcase(rizzo, Config) ->
ssl_test_lib:ct_log_supported_protocol_versions(Config),
- ct:timetrap({seconds, 40}),
+ ct:timetrap({seconds, 60}),
+ Config;
+
+init_per_testcase(no_rizzo_rc4, Config) ->
+ ssl_test_lib:ct_log_supported_protocol_versions(Config),
+ ct:timetrap({seconds, 60}),
Config;
init_per_testcase(rizzo_one_n_minus_one, Config) ->
ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
- ct:timetrap({seconds, 40}),
+ ct:timetrap({seconds, 60}),
rizzo_add_mitigation_option(one_n_minus_one, Config);
init_per_testcase(rizzo_zero_n, Config) ->
ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
- ct:timetrap({seconds, 40}),
+ ct:timetrap({seconds, 60}),
rizzo_add_mitigation_option(zero_n, Config);
init_per_testcase(rizzo_disabled, Config) ->
ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
- ct:timetrap({seconds, 40}),
+ ct:timetrap({seconds, 60}),
rizzo_add_mitigation_option(disabled, Config);
init_per_testcase(prf, Config) ->