aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-11-23 15:07:16 +0100
committerSverker Eriksson <[email protected]>2017-11-23 15:07:16 +0100
commit754afa1d10e32d2e50d0a8b5ddf316037ba9d6fc (patch)
treeaf71b76a330eab11ee9b4a208bbecf74f06532f2 /lib/kernel
parentfa3906ff8494f0c6627191269c6062f309abe984 (diff)
parent8ed0d75c186d9da24bd6cfb85732487b17a3b054 (diff)
downloadotp-754afa1d10e32d2e50d0a8b5ddf316037ba9d6fc.tar.gz
otp-754afa1d10e32d2e50d0a8b5ddf316037ba9d6fc.tar.bz2
otp-754afa1d10e32d2e50d0a8b5ddf316037ba9d6fc.zip
Merge branch 'sverker/async-auto-connect/OTP-14370' AGAIN
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/erl_distribution_wb_SUITE.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index 1145d30e5e..8256444bdc 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -677,6 +677,8 @@ build_rex_message(Cookie,OurName) ->
%% Receive a distribution message
recv_message(Socket) ->
case gen_tcp:recv(Socket, 0) of
+ {ok,[]} ->
+ recv_message(Socket); %% a tick, ignore
{ok,Data} ->
B0 = list_to_binary(Data),
<<?PASS_THROUGH, B1/binary>> = B0,