File 7703-kernel-test-Tweaked-some-test-case-s-to-use-inet-drv.patch of Package erlang
From 92cc055d97a4c7bc1c4209009d0f0993d2026bfb Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 5 May 2022 12:32:29 +0200
Subject: [PATCH 3/7] [kernel|test] Tweaked (some) test case(s) to use inet-drv
debug
OTP-18032
---
lib/kernel/test/gen_sctp_SUITE.erl | 5 ++++-
lib/kernel/test/gen_tcp_api_SUITE.erl | 5 ++++-
lib/kernel/test/gen_tcp_misc_SUITE.erl | 25 ++++++++++++++++++++-----
lib/kernel/test/gen_udp_SUITE.erl | 3 ++-
4 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 46b227af07..297c824965 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -690,6 +690,9 @@ flush() ->
%% Test the API function open/1,2 and close/1.
api_open_close(Config) when is_list(Config) ->
+ ?TC_TRY(?FUNCTION_NAME, fun() -> do_api_open_close() end).
+
+do_api_open_close() ->
{ok,S1} = gen_sctp:open(0),
{ok,P} = inet:port(S1),
ok = gen_sctp:close(S1),
@@ -706,7 +709,7 @@ api_open_close(Config) when is_list(Config) ->
{ok,P} = inet:port(S4),
ok = gen_sctp:close(S4),
- {ok,S5} = gen_sctp:open(P, [{ifaddr,any}]),
+ {ok,S5} = gen_sctp:open(P, [{debug, false}, {ifaddr,any}, {debug, true}]),
{ok,P} = inet:port(S5),
ok = gen_sctp:close(S5),
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index a0eb14dd70..cd2da3f1c9 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -638,8 +638,10 @@ do_t_fdconnect(Config) ->
FD = gen_tcp_api_SUITE:getsockfd(),
?P("try connect (to port ~w) using file descriptor ~w", [LPort, FD]),
COpts = ?INET_BACKEND_OPTS(Config) ++ [{fd, FD}, {active, false}],
- Client = try gen_tcp:connect(localhost, LPort, COpts) of
+ %% The debug is just to "see" that it (debug) "works"...
+ Client = try gen_tcp:connect(localhost, LPort, COpts ++ [{debug, true}]) of
{ok, CSock} ->
+ ok = inet:setopts(CSock, [{debug, false}]),
CSock;
{error, eaddrnotavail = CReason} ->
gen_tcp:close(L),
@@ -890,6 +892,7 @@ do_local_fdopen(Config) ->
?P("listen socket created: ~p"
"~n => try connect ~p", [L, ConnectOpts]),
C0 = ok(gen_tcp:connect(SAddr, 0, ConnectOpts)),
+ ok = inet:setopts(C0, [{debug, true}]),
?P("connected: ~p"
"~n => get fd", [C0]),
Fd = if
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 0cddac77db..e19815e44a 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -628,16 +628,25 @@ controlling_process_self(Config) when is_list(Config) ->
%% without doing any accept. The connected socket should receive
%% a tcp_closed message.
no_accept(Config) when is_list(Config) ->
- {ok, L} = ?LISTEN(Config, 0, []),
+ ?P("create listen socket"),
+ %% LOpts = [{debug, true}],
+ LOpts = [],
+ {ok, L} = ?LISTEN(Config, 0, LOpts),
{ok, {_, Port}} = inet:sockname(L),
- {ok, Client} = ?CONNECT(Config, localhost, Port, []),
+ ?P("create connection socket"),
+ %% COpts = [{debug, true}],
+ COpts = [],
+ {ok, Client} = ?CONNECT(Config, localhost, Port, COpts),
+ ?P("close listen socket"),
ok = gen_tcp:close(L),
+ ?P("await connection socket closed"),
receive
{tcp_closed, Client} ->
+ ?P("connection socket closed message received => OK"),
ok
after 5000 ->
- ct:fail(never_closed)
-
+ ?P("connection socket closed message *not* received => FAIL"),
+ ct:fail(never_closed)
end.
%% Send several packets to a socket and close it. All packets should
@@ -695,6 +704,7 @@ do_close_with_pending_output(Node, Config) ->
?P("~w -> sender spawned - accept connection", [?FUNCTION_NAME]),
{ok, A} = gen_tcp:accept(L),
?P("~w -> connection accepted - recv ~w data", [?FUNCTION_NAME, Total]),
+ %% ok = inet:setopts(A, [{debug, true}]),
case gen_tcp:recv(A, Total) of
{ok, Bin} when byte_size(Bin) == Total ->
?P("~w -> [OK] received expected ~w bytes of data - "
@@ -747,7 +757,11 @@ do_active_n(Config) ->
N = 3,
LS = ok(?LISTEN(Config, 0, [{active,N}])),
[{active,N}] = ok(inet:getopts(LS, [active])),
- ok = inet:setopts(LS, [{active,-N}]),
+ %% ok = inet:setopts(LS, [{active,-N}]),
+ %% The point of this is to "demonstrate" that its possible to
+ %% enable and then later disable debug in one (setopts) call!
+ %% Note the order! Its reversed!!
+ ok = inet:setopts(LS, [{debug, false}, {active,-N}, {debug, true}]),
receive
{tcp_passive, LS} -> ok
after
@@ -1354,6 +1368,7 @@ do_sort(Config, P, List0) ->
{error, eaddrnotavail = Reason} ->
?SKIPT(connect_failed_str(Reason))
end,
+ ok = inet:setopts(S, [{debug, true}]),
send_lines(S, List),
ok = gen_tcp:shutdown(S, write),
Lines = collect_lines(S, true),
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index de14325dd3..075dd84b64 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -561,7 +561,8 @@ do_binary_passive_recv(Config) when is_list(Config) ->
D2 = iolist_to_binary(D3),
B = D2,
?P("open receive socket"),
- {ok, R} = ?OPEN(Config, 0, [binary, {active, false}]),
+ {ok, R} = ?OPEN(Config, 0, [binary, {active, false}, {debug, true}]),
+ ok = inet:setopts(R, [{debug, false}]),
{ok, RP} = inet:port(R),
?P("open send socket"),
{ok, S} = ?OPEN(Config, 0),
--
2.35.3
