aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-09-07 09:43:05 +0200
committerIngela Anderton Andin <[email protected]>2016-09-07 09:43:05 +0200
commit61b1abd20322ad4f05eab7d53c333c6a1e91c296 (patch)
treed9f947c332c10bc5f822d1b44552da274b2dcc13
parentdb0d3b200ed9b3ca0f63ecb1901c304a5560b035 (diff)
parent566773292d5e1a9dfdcfeda348b908c22952f9de (diff)
downloadotp-61b1abd20322ad4f05eab7d53c333c6a1e91c296.tar.gz
otp-61b1abd20322ad4f05eab7d53c333c6a1e91c296.tar.bz2
otp-61b1abd20322ad4f05eab7d53c333c6a1e91c296.zip
Merge branch 'ingela/ssl/ssl_basic_SUITE-timeouts' into maint
* ingela/ssl/ssl_basic_SUITE-timeouts: ssl: Tune timeout ssl: Consistent timeout handling
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 38341f77aa..8ffee751fc 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -40,6 +40,7 @@
-define(SLEEP, 500).
-define(RENEGOTIATION_DISABLE_TIME, 12000).
-define(CLEAN_SESSION_DB, 60000).
+-define(SEC_RENEGOTIATION_TIMEOUT, 30).
%%--------------------------------------------------------------------
%% Common Test interface functions -----------------------------------
@@ -340,7 +341,7 @@ init_per_testcase(TestCase, Config) when TestCase == client_renegotiate;
TestCase == renegotiate_dos_mitigate_passive;
TestCase == renegotiate_dos_mitigate_absolute ->
ssl_test_lib:ct_log_supported_protocol_versions(Config),
- ct:timetrap({seconds, 90}),
+ ct:timetrap({seconds, ?SEC_RENEGOTIATION_TIMEOUT + 5}),
Config;
init_per_testcase(TestCase, Config) when TestCase == psk_cipher_suites;
@@ -440,7 +441,9 @@ init_per_testcase(accept_pool, Config) ->
ssl_test_lib:ct_log_supported_protocol_versions(Config),
Config
end;
-
+init_per_testcase(controller_dies, Config) ->
+ ct:timetrap({seconds, 10}),
+ Config;
init_per_testcase(_TestCase, Config) ->
ssl_test_lib:ct_log_supported_protocol_versions(Config),
ct:timetrap({seconds, 5}),
@@ -4298,7 +4301,7 @@ erlang_ssl_receive(Socket, Data) ->
erlang_ssl_receive(Socket, tl(Data));
Other ->
ct:fail({unexpected_message, Other})
- after ?SLEEP * 3 * test_server:timetrap_scale_factor() ->
+ after timer:seconds(?SEC_RENEGOTIATION_TIMEOUT) * test_server:timetrap_scale_factor() ->
ct:fail({did_not_get, Data})
end.