aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_basic_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2012-12-03 16:16:06 +0100
committerBjörn-Egil Dahlberg <egil@erlang.org>2012-12-06 14:47:04 +0100
commitc433c9089e3aeff7c9ae04248e2ec0993b0b9e9f (patch)
tree90cec6d148b651b43b42985eddf422b35e7925bb /lib/ssl/test/ssl_basic_SUITE.erl
parenta1bd47a9e8b562bdc8dca741bbd9e1bc4c0f9b2b (diff)
downloadotp-c433c9089e3aeff7c9ae04248e2ec0993b0b9e9f.tar.gz
otp-c433c9089e3aeff7c9ae04248e2ec0993b0b9e9f.tar.bz2
otp-c433c9089e3aeff7c9ae04248e2ec0993b0b9e9f.zip
ssl: Fix recv after timeout expired
Reset state so that "recv data" is not sent as "active data" after a recv timed out and no new recv has been called.
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 7689da7200..112ed85ec5 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -4080,7 +4080,13 @@ send_recv_result(Socket) ->
send_recv_result_timeout_client(Socket) ->
{error, timeout} = ssl:recv(Socket, 11, 500),
ssl:send(Socket, "Hello world"),
- {ok, "Hello world"} = ssl:recv(Socket, 11),
+ receive
+ Msg ->
+ io:format("Msg ~p~n",[Msg])
+ after 500 ->
+ ok
+ end,
+ {ok, "Hello world"} = ssl:recv(Socket, 11, 500),
ok.
send_recv_result_timeout_server(Socket) ->
ssl:send(Socket, "Hello"),