diff options
author | Patrik Nyblom <[email protected]> | 2010-09-13 10:52:43 +0200 |
---|---|---|
committer | Patrik Nyblom <[email protected]> | 2010-09-13 10:52:43 +0200 |
commit | 525fd7b044e78ae54527af6b0a21a2c7d49f78c9 (patch) | |
tree | 9e6a833aa20a436a3e2a2ffa99a4ff60f49db7fb /lib/kernel | |
parent | e5f1c776df55a965f2f61d9881f17c8bf32e8621 (diff) | |
parent | d9ad7fc091e850d9484e3f1fdf9ede22f9a18e04 (diff) | |
download | otp-525fd7b044e78ae54527af6b0a21a2c7d49f78c9.tar.gz otp-525fd7b044e78ae54527af6b0a21a2c7d49f78c9.tar.bz2 otp-525fd7b044e78ae54527af6b0a21a2c7d49f78c9.zip |
Merge branch 'pan/windows-testcases/OTP-8820' into dev
* pan/windows-testcases/OTP-8820:
Teach Winsock initialization to be thread safe
Make ei_threaded_send synchronized
Increase timeout value in ei_accept_SUITE
Teach ei_accept_SUITE to wait for node publish instead of using random sleeps
Teach port suite to not use unix-specific commands and not leave them running
Add line macros to gen_udp_SUITE:connect
Diffstat (limited to 'lib/kernel')
-rw-r--r-- | lib/kernel/test/gen_udp_SUITE.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl index 44dd8607b9..bbdfbd3cb0 100644 --- a/lib/kernel/test/gen_udp_SUITE.erl +++ b/lib/kernel/test/gen_udp_SUITE.erl @@ -415,15 +415,15 @@ connect(suite) -> connect(doc) -> ["Test that connect/3 has effect"]; connect(Config) when is_list(Config) -> - Addr = {127,0,0,1}, - {ok,S1} = gen_udp:open(0), - {ok,P1} = inet:port(S1), - {ok,S2} = gen_udp:open(0), - ok = inet:setopts(S2, [{active,false}]), - ok = gen_udp:close(S1), - ok = gen_udp:connect(S2, Addr, P1), - ok = gen_udp:send(S2, <<16#deadbeef:32>>), - {error,econnrefused} = gen_udp:recv(S2, 0, 5), + ?line Addr = {127,0,0,1}, + ?line {ok,S1} = gen_udp:open(0), + ?line {ok,P1} = inet:port(S1), + ?line {ok,S2} = gen_udp:open(0), + ?line ok = inet:setopts(S2, [{active,false}]), + ?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), ok. implicit_inet6(Config) when is_list(Config) -> |