diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-09-05 12:02:28 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-09-07 09:41:22 +0200 |
| commit | 5f16e125e4e07d9485f9564c9f1cc35f417969bf (patch) | |
| tree | 92facc7eba1ad2bee5b659c85bb36921a761f63f /lib | |
| parent | db0d3b200ed9b3ca0f63ecb1901c304a5560b035 (diff) | |
| download | otp-5f16e125e4e07d9485f9564c9f1cc35f417969bf.tar.gz otp-5f16e125e4e07d9485f9564c9f1cc35f417969bf.tar.bz2 otp-5f16e125e4e07d9485f9564c9f1cc35f417969bf.zip | |
ssl: Consistent timeout handling
init_per_testcase timeout for renegotiation tests would be overridden
by local timeout in test case help function.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 38341f77aa..f5b46af1b3 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; @@ -4298,7 +4299,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. |