aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-11-29 13:56:39 +0100
committerPatrik Nyblom <[email protected]>2010-11-29 13:56:39 +0100
commit9cee34946d1d06c358a9b7a260f57d05fbb08fd1 (patch)
tree82c2da777b39910a6ae33c5e61f9831b7c741ccb
parent07d875f3255ccc1dea6e1189879e8f74f6f750b5 (diff)
parentea7a57a175e58a72231111a5bd612035379e8283 (diff)
downloadotp-9cee34946d1d06c358a9b7a260f57d05fbb08fd1.tar.gz
otp-9cee34946d1d06c358a9b7a260f57d05fbb08fd1.tar.bz2
otp-9cee34946d1d06c358a9b7a260f57d05fbb08fd1.zip
Merge branch 'pan/gen_udp-connect-testcase/OTP-8860' into dev
* pan/gen_udp-connect-testcase/OTP-8860: Teach gen_udp_SUITE:connect testcase about econnreset on Windows
-rw-r--r--lib/kernel/test/gen_udp_SUITE.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index bbdfbd3cb0..2ff1d7210a 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -423,7 +423,11 @@ connect(Config) when is_list(Config) ->
?line ok = gen_udp:close(S1),
?line ok = gen_udp:connect(S2, Addr, P1),
?line ok = gen_udp:send(S2, <<16#deadbeef:32>>),
- ?line {error,econnrefused} = gen_udp:recv(S2, 0, 5),
+ ?line ok = case gen_udp:recv(S2, 0, 5) of
+ {error,econnrefused} -> ok;
+ {error,econnreset} -> ok;
+ Other -> Other
+ end,
ok.
implicit_inet6(Config) when is_list(Config) ->