File 2052-esock-test-Adjusted-ioctl-some-test-case-s... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2052-esock-test-Adjusted-ioctl-some-test-case-s.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Currently displaying revision b86624bd0b247ddee296914ae2ffe962 , Show latest

From f989bb23ac120d8d9258d3330906cb4f2de0c324 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 16 Nov 2021 15:56:33 +0100
Subject: [PATCH 52/58] [esock|test] Adjusted ioctl (some) test case(s)

Tweaked the ioctl_get_gifdstaddr and ioctl_get_gifbrdaddr
test cases. Fails because of "unexpected" return values
on NetBSD and (some) darwin.

OTP-17528
---
 lib/kernel/test/socket_SUITE.erl | 192 ++++++++++++++++++++++---------
 1 file changed, 139 insertions(+), 53 deletions(-)

diff --git a/lib/kernel/test/socket_SUITE.erl b/lib/kernel/test/socket_SUITE.erl
index edfb160760..52bb78bc29 100644
--- a/lib/kernel/test/socket_SUITE.erl
+++ b/lib/kernel/test/socket_SUITE.erl
@@ -35166,8 +35166,33 @@ ioctl_get_gifdstaddr(_Config) when is_list(_Config) ->
 
 
 do_ioctl_get_gifdstaddr(_State) ->
-    i("create dummy stream:TCP socket"),
-    {ok, Sock} = socket:open(inet, stream, tcp),
+    Domain = inet,
+    LSA    = which_local_socket_addr(Domain),
+
+    i("create and init listen stream:TCP socket"),
+    {ok, LSock} = socket:open(inet, stream, tcp),
+    ok = socket:bind(LSock, LSA#{port => 0}),
+    ok = socket:listen(LSock),
+    {ok, #{port := LPort}} = socket:sockname(LSock),
+    
+    i("create and init connection stream:TCP socket"),
+    {ok, CSock} = socket:open(inet, stream, tcp),
+
+    i("attempt nowait connect"),
+    {select, {select_info, _Tag, SelectHandle} = _SelectInfo} =
+        socket:connect(CSock, LSA#{port => LPort}, nowait),
+
+    i("attempt accept"),
+    {ok, ASock} = socket:accept(LSock),
+    
+    i("await connection ready"),
+    receive
+        {'$socket', CSock, select, SelectHandle} ->
+            ok
+    end,
+
+    i("attmpt complete connection"),
+    ok = socket:connect(CSock),
 
     i("get if names"),
     {ok, IfNames} = net:if_names(),
@@ -35176,37 +35201,57 @@ do_ioctl_get_gifdstaddr(_State) ->
       "~n      ~p", [IfNames]),
     %% This a *very* simple test...
     %% ...just to check that we actually get an socket address
-    _ = [case socket:ioctl(Sock, gifdstaddr, IfName) of
-             {ok, #{family := Fam,
-                    addr   := Addr}} ->
-                 i("got (expected) (dest) socket address for interface ~p (~w): "
-                   "~n      (~w) ~p", [IfName, IfIdx, Fam, Addr]),
-                 ok;
-             {ok, Crap} ->
-                 %% Oups?!
-                 i("<ERROR> got unexpected result for interface ~p (~w)"
-                   "~n      ~p", [IfName, IfIdx, Crap]),
-                 socket:close(Sock),
-                 ?FAIL({unexpected_addr, IfName, IfIdx, Crap});
-             {error, eaddrnotavail = Reason} ->
-                 i("got unexpected error for interface ~p (~w) => SKIP interface"
-                   "~n      Reason: ~p", [IfName, IfIdx, Reason]),
-                 ignore;
-             {error, Reason} ->
-                 i("<ERROR> got unexpected error for interface ~p (~w)"
-                   "~n      Reason: ~p", [IfName, IfIdx, Reason]),
-                 socket:close(Sock),
-                 ?FAIL({unexpected_failure, IfName, IfIdx, Reason})
-         end || {IfIdx, IfName} <- IfNames],
+    verify_gifdstaddr(ASock, "accept",  IfNames),
+    verify_gifdstaddr(CSock, "connect", IfNames),
+    verify_gifdstaddr(LSock, "listen",  IfNames),
 
-    i("close dummy stream:TCP socket"),
-    ok = socket:close(Sock),
+    i("close socket(s)"),
+    _ = socket:close(CSock),
+    _ = socket:close(ASock),
+    _ = socket:close(LSock),
 
     i("done"),
     ok.
 
 
 
+verify_gifdstaddr(_Sock, _Prefix, []) ->
+    ok;
+verify_gifdstaddr(Sock, Prefix, [{IfIdx, IfName} | IfNames]) ->
+    i("[~s] attempt verify gifdstaddr for interface ~s (~w)",
+      [Prefix, IfName, IfIdx]),
+    verify_gifdstaddr(Sock, Prefix, IfIdx, IfName),
+    verify_gifdstaddr(Sock, Prefix, IfNames).
+
+verify_gifdstaddr(Sock, Prefix, IfIdx, IfName) ->
+    case socket:ioctl(Sock, gifdstaddr, IfName) of
+        {ok, #{family := Fam,
+               addr   := Addr}} ->
+            i("[~s] got (expected) (dest) socket address "
+              "for interface ~p (~w): "
+              "~n      (~w) ~p", [Prefix, IfName, IfIdx, Fam, Addr]),
+            ok;
+        {ok, Crap} ->
+        %% Oups?!
+            i("<ERROR> [~s] got unexpected result for interface ~p (~w)"
+              "~n      ~p", [Prefix, IfName, IfIdx, Crap]),
+            socket:close(Sock),
+            ?FAIL({unexpected_addr, Prefix, IfName, IfIdx, Crap});
+        {error, eaddrnotavail = Reason} ->
+            i("[~s] got unexpected error for interface ~p (~w) => "
+              "SKIP interface"
+              "~n      Reason: ~p", [Prefix, IfName, IfIdx, Reason]),
+            ignore;
+        {error, Reason} ->
+            i("<ERROR> got unexpected error for interface ~p (~w)"
+              "~n      Reason: ~p", [IfName, IfIdx, Reason]),
+            socket:close(Sock),
+            ?FAIL({unexpected_failure, Prefix, IfName, IfIdx, Reason})
+    end.
+    
+
+
+
 %% --- gifbrdaddr ---
 
 ioctl_get_gifbrdaddr(suite) ->
@@ -35227,8 +35272,33 @@ ioctl_get_gifbrdaddr(_Config) when is_list(_Config) ->
 
 
 do_ioctl_get_gifbrdaddr(_State) ->
-    i("create dummy stream:TCP socket"),
-    {ok, Sock} = socket:open(inet, stream, tcp),
+    Domain = inet,
+    LSA    = which_local_socket_addr(Domain),
+
+    i("create and init listen stream:TCP socket"),
+    {ok, LSock} = socket:open(inet, stream, tcp),
+    ok = socket:bind(LSock, LSA#{port => 0}),
+    ok = socket:listen(LSock),
+    {ok, #{port := LPort}} = socket:sockname(LSock),
+    
+    i("create and init connection stream:TCP socket"),
+    {ok, CSock} = socket:open(inet, stream, tcp),
+
+    i("attempt nowait connect"),
+    {select, {select_info, _Tag, SelectHandle} = _SelectInfo} =
+        socket:connect(CSock, LSA#{port => LPort}, nowait),
+
+    i("attempt accept"),
+    {ok, ASock} = socket:accept(LSock),
+    
+    i("await connection ready"),
+    receive
+        {'$socket', CSock, select, SelectHandle} ->
+            ok
+    end,
+
+    i("attmpt complete connection"),
+    ok = socket:connect(CSock),
 
     i("get if names"),
     {ok, IfNames} = net:if_names(),
@@ -35237,37 +35307,53 @@ do_ioctl_get_gifbrdaddr(_State) ->
       "~n      ~p", [IfNames]),
     %% This a *very* simple test...
     %% ...just to check that we actually get an socket address
-    _ = [case socket:ioctl(Sock, gifbrdaddr, IfName) of
-             {ok, #{family := Fam,
-                    addr   := Addr}} ->
-                 i("got (expected) (broadcast) socket address for "
-                   "interface ~p (~w): "
-                   "~n      (~w) ~p", [IfName, IfIdx, Fam, Addr]),
-                 ok;
-             {ok, Crap} ->
-                 %% Oups?!
-                 i("<ERROR> got unexpected result for interface ~p (~w)"
-                   "~n      ~p", [IfName, IfIdx, Crap]),
-                 socket:close(Sock),
-                 ?FAIL({unexpected_addr, IfName, IfIdx, Crap});
-             {error, eaddrnotavail = Reason} ->
-                 i("got unexpected error for interface ~p (~w) => SKIP interface"
-                   "~n      Reason: ~p", [IfName, IfIdx, Reason]),
-                 ignore;
-             {error, Reason} ->
-                 i("<ERROR> got unexpected error for interface ~p (~w)"
-                   "~n      Reason: ~p", [IfName, IfIdx, Reason]),
-                 socket:close(Sock),
-                 ?FAIL({unexpected_failure, IfName, IfIdx, Reason})
-         end || {IfIdx, IfName} <- IfNames],
+    verify_gifbrdaddr(ASock, "accept",  IfNames),
+    verify_gifbrdaddr(CSock, "connect", IfNames),
+    verify_gifbrdaddr(LSock, "listen",  IfNames),
 
-    i("close dummy stream:TCP socket"),
-    ok = socket:close(Sock),
+    i("close socket(s)"),
+    _ = socket:close(CSock),
+    _ = socket:close(ASock),
+    _ = socket:close(LSock),
 
     i("done"),
     ok.
 
 
+verify_gifbrdaddr(_Sock, _Prefix, []) ->
+    ok;
+verify_gifbrdaddr(Sock, Prefix, [{IfIdx, IfName} | IfNames]) ->
+    i("[~s] attempt verify gifbrdaddr for interface ~s (~w)",
+      [Prefix, IfName, IfIdx]),
+    verify_gifbrdaddr(Sock, Prefix, IfIdx, IfName),
+    verify_gifbrdaddr(Sock, Prefix, IfNames).
+
+verify_gifbrdaddr(Sock, Prefix, IfIdx, IfName) ->
+    case socket:ioctl(Sock, gifbrdaddr, IfName) of
+        {ok, #{family := Fam,
+               addr   := Addr}} ->
+            i("got (expected) (broadcast) socket address for "
+              "interface ~p (~w): "
+              "~n      (~w) ~p", [IfName, IfIdx, Fam, Addr]),
+            ok;
+        {ok, Crap} ->
+            %% Oups?!
+            i("<ERROR> got unexpected result for interface ~p (~w)"
+              "~n      ~p", [IfName, IfIdx, Crap]),
+            socket:close(Sock),
+            ?FAIL({unexpected_addr, IfName, IfIdx, Crap});
+        {error, eaddrnotavail = Reason} ->
+            i("got unexpected error for interface ~p (~w) => SKIP interface"
+              "~n      Reason: ~p", [IfName, IfIdx, Reason]),
+            ignore;
+        {error, Reason} ->
+            i("<ERROR> got unexpected error for interface ~p (~w)"
+              "~n      Reason: ~p", [IfName, IfIdx, Reason]),
+            socket:close(Sock),
+            ?FAIL({unexpected_failure, IfName, IfIdx, Reason})
+    end.
+
+
 
 %% --- gifnetmask ---
 
-- 
2.31.1

Places

File 2052-esock-test-Adjusted-ioctl-some-test-case-s.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Places