File 0209-kernel-test-Add-simple-test-cases.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0209-kernel-test-Add-simple-test-cases.patch of Package erlang (Revision c210e1cc799e19676b4330d52bebb11f)

Currently displaying revision c210e1cc799e19676b4330d52bebb11f , Show latest

From c6d8967198e3e4515ed81cc3908821b92d658042 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 15 Jun 2021 14:49:11 +0200
Subject: [PATCH 2/2] [kernel|test] Add (simple) test cases

Add two simple test cases to is a very simple way verify
that inet:info/1 behaves "properly".

OTP-17492
---
 lib/kernel/src/inet.erl                |  4 +-
 lib/kernel/test/gen_tcp_misc_SUITE.erl | 69 +++++++++++++++++++++-
 lib/kernel/test/gen_udp_SUITE.erl      | 82 ++++++++++++++++++++++++--
 3 files changed, 146 insertions(+), 9 deletions(-)

diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index e5bf891e73..c20320e8b3 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -708,9 +708,7 @@ port_info(P) when is_port(P) ->
     end.
 
 port_info(PI, Items) when is_list(PI) ->
-    port_info(PI, Items, []);
-port_info(_, _) ->
-    [].
+    port_info(PI, Items, []).
 
 port_info(_PI, [], Acc) ->
     Acc;
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 8a51b2ebfa..5cabefa82a 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -66,7 +66,8 @@
 	 socket_monitor1_demon_after/1,
 	 socket_monitor2/1,
 	 socket_monitor2_manys/1,
-	 socket_monitor2_manyc/1
+	 socket_monitor2_manyc/1,
+	 otp_17492/1
 	]).
 
 %% Internal exports.
@@ -188,7 +189,8 @@ all_cases() ->
      otp_8102, otp_9389,
      otp_12242, delay_send_error,
      bidirectional_traffic,
-     {group, socket_monitor}
+     {group, socket_monitor},
+     otp_17492
     ].
 
 close_cases() ->
@@ -7141,6 +7143,69 @@ do_socket_monitor2_manyc(Config) ->
     ok.
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This is the most basic of tests.
+%% Spawn a process that creates a (listen) socket, then spawns (client)
+%% processes that create monitors to it...
+otp_17492(Config) when is_list(Config) ->
+    ct:timetrap(?MINS(1)),
+    ?TC_TRY(otp_17492, fun() -> do_otp_17492(Config) end).
+
+do_otp_17492(Config) ->
+    ?P("begin"),
+
+    Self = self(),
+
+    ?P("try create listen socket"),
+    {ok, L} = ?LISTEN(Config, 0, []),
+
+    ?P("try get (created) listen socket info"),
+    try inet:info(L) of
+	#{owner := Owner} = Info when is_pid(Owner) andalso (Owner =:= Self) ->
+	    ?P("(created) Listen socket info: ~p", [Info]);
+	OBadInfo ->
+	    ?P("(created) listen socket info: ~p", [OBadInfo]),
+	    (catch gen_tcp:close(L)),
+	    ct:fail({invalid_created_info, OBadInfo})
+    catch
+	OC:OE:OS ->
+	    ?P("Failed get (created) listen socket info: "
+	       "~n   Class: ~p"
+	       "~n   Error: ~p"
+	       "~n   Stack: ~p", [OC, OE, OS]),
+	    (catch gen_tcp:close(L)),
+	    ct:fail({unexpected_created_info_result, {OC, OE, OS}})
+    end,
+
+    ?P("try close (listen) socket"),
+    ok = gen_tcp:close(L),
+
+    ?P("try get (closed) listen socket info"),
+    try inet:info(L) of
+	#{states := [closed]} = CInfo when is_port(L) ->
+	    ?P("(closed) listen socket info: "
+	       "~n   ~p", [CInfo]);
+	#{rstates := [closed], wstates := [closed]} = CInfo ->
+	    ?P("(closed) listen socket info: "
+	       "~n   ~p", [CInfo]);
+	CBadInfo ->
+	    ?P("(closed) listen socket info: ~p", [CBadInfo]),
+	    ct:fail({invalid_closed_info, CBadInfo})
+    catch
+	CC:CE:CS ->
+	    ?P("Failed get (closed) listen socket info: "
+	       "~n   Class: ~p"
+	       "~n   Error: ~p"
+	       "~n   Stack: ~p", [CC, CE, CS]),
+	    (catch gen_tcp:close(L)),
+	    ct:fail({unexpected_closed_info_result, {CC, CE, CS}})
+    end,
+
+    ?P("done"),
+    ok.
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 pi(Item) ->
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index c30caee9fc..b24f8ab387 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -35,7 +35,8 @@
 	 init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
--export([send_to_closed/1, active_n/1,
+-export([
+	 send_to_closed/1, active_n/1,
 	 buffer_size/1, binary_passive_recv/1, max_buffer_size/1, bad_address/1,
 	 read_packets/1, recv_poll_after_active_once/1,
          open_fd/1, connect/1, implicit_inet6/1,
@@ -43,7 +44,9 @@
          sendtos/1, sendtosttl/1, sendttl/1, sendtclass/1,
 	 local_basic/1, local_unbound/1,
 	 local_fdopen/1, local_fdopen_unbound/1, local_abstract/1,
-         recv_close/1]).
+         recv_close/1,
+	 otp_17492/1
+	]).
 
 
 -define(TRY_TC(F), try_tc(F)).
@@ -68,7 +71,8 @@ all() ->
      recvtos, recvtosttl, recvttl, recvtclass,
      sendtos, sendtosttl, sendttl, sendtclass,
      {group, local},
-     recv_close
+     recv_close,
+     otp_17492
     ].
 
 groups() -> 
@@ -127,7 +131,7 @@ init_per_group(local, Config) ->
 	{ok,S} ->
 	    ok = gen_udp:close(S),
 	    Config;
-	{error,eafnosupport} ->
+	{error, eafnosupport} ->
 	    {skip, "AF_LOCAL not supported"}
     end;
 init_per_group(_GroupName, Config) ->
@@ -1197,6 +1201,9 @@ connect(Config) when is_list(Config) ->
     ?P("done"),
     ok.
 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 implicit_inet6(Config) when is_list(Config) ->
     ?TC_TRY(implicit_inet6, fun() -> do_implicit_inet6(Config) end).
 
@@ -1288,6 +1295,73 @@ implicit_inet6(S1, Active, Addr) ->
     ok = gen_udp:close(S2),
     ok.
 
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This is the most basic of tests.
+%% Spawn a process that creates a socket, then spawns (client)
+%% processes that create monitors to it...
+otp_17492(Config) when is_list(Config) ->
+    ct:timetrap(?MINS(1)),
+    ?TC_TRY(otp_17492, fun() -> do_otp_17492(Config) end).
+
+do_otp_17492(Config) ->
+    ?P("begin"),
+
+    Self = self(),
+
+    ?P("try create socket"),
+    {ok, L} = gen_udp:open(0, []),
+
+    ?P("try get (created) socket info"),
+    try inet:info(L) of
+	#{owner := Owner} = Info when is_pid(Owner) andalso (Owner =:= Self) ->
+	    ?P("(created) socket info: ~p", [Info]);
+	OBadInfo ->
+	    ?P("(created) socket info: ~p", [OBadInfo]),
+	    (catch gen_udp:close(L)),
+	    ct:fail({invalid_created_info, OBadInfo})
+    catch
+	OC:OE:OS ->
+	    ?P("Failed get (created) Listen socket info: "
+	       "~n   Class: ~p"
+	       "~n   Error: ~p"
+	       "~n   Stack: ~p", [OC, OE, OS]),
+	    (catch gen_udp:close(L)),
+	    ct:fail({unexpected_created_info_result, {OC, OE, OS}})
+    end,
+
+    ?P("try close socket"),
+    ok = gen_udp:close(L),
+
+    ?P("try get (closed) socket info"),
+    try inet:info(L) of
+	#{states := [closed]} = CInfo when is_port(L) ->
+	    ?P("(closed) socket info: "
+	       "~n   ~p", [CInfo]);
+	#{rstates := [closed], wstates := [closed]} = CInfo ->
+	    ?P("(closed) socket info: "
+	       "~n   ~p", [CInfo]);
+	CBadInfo ->
+	    ?P("(closed) socket info: ~p", [CBadInfo]),
+	    ct:fail({invalid_closed_info, CBadInfo})
+    catch
+	CC:CE:CS ->
+	    ?P("Failed get (closed) socket info: "
+	       "~n   Class: ~p"
+	       "~n   Error: ~p"
+	       "~n   Stack: ~p", [CC, CE, CS]),
+	    (catch gen_udp:close(L)),
+	    ct:fail({unexpected_closed_info_result, {CC, CE, CS}})
+    end,
+
+    ?P("done"),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 ok({ok,V}) -> V;
 ok(NotOk) ->
     try throw(not_ok)
-- 
2.26.2

Places

File 0209-kernel-test-Add-simple-test-cases.patch of Package erlang (Revision c210e1cc799e19676b4330d52bebb11f)

Places