diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-09-18 09:25:11 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-09-18 09:25:11 +0200 |
| commit | 9b01223a5ff7e157c57ef832afc985662c97e123 (patch) | |
| tree | a6a8ba108259e256c73f814bfec70d030128789d /lib | |
| parent | b5fc65bb0a959bd96c125ce523c41052bbc0c04d (diff) | |
| parent | 85276c69d9bf43ac85b4de3aacfc5f9baf15bcf0 (diff) | |
| download | otp-9b01223a5ff7e157c57ef832afc985662c97e123.tar.gz otp-9b01223a5ff7e157c57ef832afc985662c97e123.tar.bz2 otp-9b01223a5ff7e157c57ef832afc985662c97e123.zip | |
Merge branch 'ia/ssl/cuddle_tests' into maint
* ia/ssl/cuddle_tests:
ssl: Timeout tuning
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 5 |
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 82c3c4ac74..6f6107de2c 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -3983,13 +3983,16 @@ connect_dist_c(S) -> tls_downgrade(Socket) -> ok = ssl_test_lib:send_recv_result(Socket), - case ssl:close(Socket, {self(), 5000}) of + case ssl:close(Socket, {self(), 10000}) of {ok, TCPSocket} -> inet:setopts(TCPSocket, [{active, true}]), gen_tcp:send(TCPSocket, "Downgraded"), receive {tcp, TCPSocket, <<"Downgraded">>} -> ok; + {tcp_closed, TCPSocket} -> + ct:pal("Peer timed out, downgrade aborted"), + ok; Other -> {error, Other} end; |