diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-31 15:52:23 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-08-22 14:08:42 +0200 |
| commit | d5ad1771c0bc45fa99fe3b914dd852702c13e55e (patch) | |
| tree | 576e8466226ebd499639536cdc1ac0a51d2352f7 | |
| parent | 44655c3ed728771b791af56efb9188855058c40f (diff) | |
| download | otp-d5ad1771c0bc45fa99fe3b914dd852702c13e55e.tar.gz otp-d5ad1771c0bc45fa99fe3b914dd852702c13e55e.tar.bz2 otp-d5ad1771c0bc45fa99fe3b914dd852702c13e55e.zip | |
ssl: Cuddle timeout
| -rw-r--r-- | lib/ssl/test/ssl_api_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_session_cache_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/test/tls_api_SUITE.erl | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssl/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl index fefecc0b65..280ea63e51 100644 --- a/lib/ssl/test/ssl_api_SUITE.erl +++ b/lib/ssl/test/ssl_api_SUITE.erl @@ -1902,7 +1902,7 @@ do_recv_close(Socket) -> tls_close(Socket) -> ok = ssl_test_lib:send_recv_result(Socket), - case ssl:close(Socket, 5000) of + case ssl:close(Socket, 10000) of ok -> ok; {error, closed} -> diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl index b71b15b028..553c2d247b 100644 --- a/lib/ssl/test/ssl_session_cache_SUITE.erl +++ b/lib/ssl/test/ssl_session_cache_SUITE.erl @@ -28,7 +28,7 @@ -include_lib("common_test/include/ct.hrl"). -define(DELAY, 500). --define(SLEEP, 500). +-define(SLEEP, 1000). -define(TIMEOUT, 60000). -define(LONG_TIMEOUT, 600000). -define(MAX_TABLE_SIZE, 5). @@ -207,7 +207,7 @@ session_cleanup(Config) when is_list(Config) -> end, %% Make sure session is registered - ct:sleep(?SLEEP), + ct:sleep(?SLEEP*2), {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)), [_, _,_, _, Prop] = StatusInfo, diff --git a/lib/ssl/test/tls_api_SUITE.erl b/lib/ssl/test/tls_api_SUITE.erl index 5a74ec1892..7239d4cb90 100644 --- a/lib/ssl/test/tls_api_SUITE.erl +++ b/lib/ssl/test/tls_api_SUITE.erl @@ -794,16 +794,16 @@ tls_downgrade_result(Socket, Pid) -> {tcp, TCPSocket, <<"Downgraded">>} -> ok; {tcp_closed, TCPSocket} -> - ct:fail("Peer timed out, downgrade aborted"), + ct:fail("Did not receive TCP data"), ok; Other -> {error, Other} end; {error, timeout} -> - ct:fail("Timed out, downgrade aborted"), + ct:comment("Timed out, downgrade aborted"), ok; Fail -> - {error, Fail} + ct:fail(Fail) end. tls_shutdown_result(Socket, server) -> |