aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-05-04 11:54:56 +0200
committerPatrik Nyblom <[email protected]>2012-05-04 11:54:56 +0200
commitbb1734e95a5f6a7315819c24bc1fdd799534c787 (patch)
tree2bbab9b3a467587482795c471e1c78c08b8bad30 /lib
parentc5d6ce6a07478c5ac19fdf2df244c4b837888d08 (diff)
parentee6fbc1f57bb7ad7ae19f1978628fc5640bbeb7a (diff)
downloadotp-bb1734e95a5f6a7315819c24bc1fdd799534c787.tar.gz
otp-bb1734e95a5f6a7315819c24bc1fdd799534c787.tar.bz2
otp-bb1734e95a5f6a7315819c24bc1fdd799534c787.zip
Merge branch 'pan/active_once/OTP-10055' into maint
* pan/active_once/OTP-10055: Remove race in gen_tcp_misc_SUITE:otp_9389 gen_tcp: Make setopts(S,[{active,once}]) try a read
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/test/gen_tcp_misc_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index c74a258af9..0c53b1e85b 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -2044,7 +2044,7 @@ send_timeout_active(Config) when is_list(Config) ->
?line {error,timeout} =
Loop(fun() ->
receive
- {tcp, Sock, _Data} ->
+ {tcp, _Sock, _Data} ->
inet:setopts(A, [{active, once}]),
Res = gen_tcp:send(A,lists:duplicate(1000, $a)),
%erlang:display(Res),
@@ -2536,7 +2536,7 @@ otp_8102_do(LSocket, PortNum, {Bin,PType}) ->
otp_9389(doc) -> ["Verify packet_size handles long HTTP header lines"];
otp_9389(suite) -> [];
otp_9389(Config) when is_list(Config) ->
- ?line {ok, LS} = gen_tcp:listen(0, []),
+ ?line {ok, LS} = gen_tcp:listen(0, [{active,false}]),
?line {ok, {_, PortNum}} = inet:sockname(LS),
io:format("Listening on ~w with port number ~p\n", [LS, PortNum]),
OrigLinkHdr = "/" ++ string:chars($S, 8192),