File 2124-kernel-socket-test-Fixed-ioctl-test-case.p... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2124-kernel-socket-test-Fixed-ioctl-test-case.patch of Package erlang (Revision f663696ed814cd9e073edce69f588c34)

Currently displaying revision f663696ed814cd9e073edce69f588c34 , Show latest

From b123d858c2b08bd96e81b4550bb0bcaeb3b767c5 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Fri, 11 Mar 2022 17:46:40 +0100
Subject: [PATCH 4/4] [kernel|socket|test] Fixed ioctl test case

OTP-17968
---
 lib/kernel/test/socket_SUITE.erl | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/lib/kernel/test/socket_SUITE.erl b/lib/kernel/test/socket_SUITE.erl
index 5d8f6a2ad7..054171e22e 100644
--- a/lib/kernel/test/socket_SUITE.erl
+++ b/lib/kernel/test/socket_SUITE.erl
@@ -35163,22 +35163,8 @@ do_ioctl_get_gifhwaddr(_State) ->
     %% This a *very* simple test...
     %% ...just to check that we actually get an socket address
     _ = [case socket:ioctl(Sock, gifhwaddr, IfName) of
-             {ok, #{family := ArphdrFam,
-                    addr   := Addr}} when is_atom(ArphdrFam) ->
-                 case erlang:atom_to_list(ArphdrFam) of
-                     "arphrd_" ++ _ ->
-                         i("got (expected) (HW) socket address for "
-                           "interface ~p (~w): "
-                           "~n      (~w) ~p", [IfName, IfIdx, ArphdrFam, Addr]),
-                         ok;
-                     _ ->
-                         i("<ERROR> got unexpected family for interface ~p (~w)"
-                           "~n      ~p", [IfName, IfIdx, ArphdrFam]),
-                         socket:close(Sock),
-                         ?FAIL({unexpected_family, IfName, IfIdx, ArphdrFam})
-                 end;
              {ok, #{family := Fam,
-                    addr   := Addr}} when is_integer(Fam) ->
+                    addr   := Addr}} when is_atom(Fam) orelse is_integer(Fam) ->
                  i("got (expected) socket address for interface ~p (~w): "
                    "~n      (~w) ~p", [IfName, IfIdx, Fam, Addr]),
                  ok;
-- 
2.34.1

Places

File 2124-kernel-socket-test-Fixed-ioctl-test-case.patch of Package erlang (Revision f663696ed814cd9e073edce69f588c34)

Places