File 2232-kernel-sctp-test-More-nxdomain-tweaking.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2232-kernel-sctp-test-More-nxdomain-tweaking.patch of Package erlang (Revision a7029ee97b719a45764ae3b135bbdda2)

Currently displaying revision a7029ee97b719a45764ae3b135bbdda2 , Show latest

From 4be0d72af323f4976644a2a82621eb3b26abc116 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 16 Dec 2020 13:51:33 +0100
Subject: [PATCH 2/4] [kernel|sctp|test] More (nxdomain-) tweaking

---
 lib/kernel/test/gen_sctp_SUITE.erl | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 3ed9164ef1..c1e1bb86bc 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -1670,10 +1670,10 @@ get_addrs_by_family_aux(Family, NumAddrs) when Family =:= inet;
 					       Family =:= inet6 ->
     case inet:getaddr(localhost, Family) of
 	{error, eafnosupport = Reason} ->
-            ?P("failed get addrs for localhost: ~p", [Reason]),
+            ?P("failed get (~w) addrs for localhost: ~p", [Family, Reason]),
 	    {error, ?F("No support for ~p (~p)", [Family, Reason])};
         {error, nxdomain = Reason} ->
-            ?P("failed get addrs for localhost: ~p", [Reason]),
+            ?P("failed get (~w) addrs for localhost: ~p", [Family, Reason]),
 	    {error, ?F("No support for ~p", [Family, Reason])};
 	{ok, _} ->
             ?P("got addr for localhost (ignored)"),
@@ -1692,10 +1692,14 @@ get_addrs_by_family_aux(Family, NumAddrs) when Family =:= inet;
 	    end
     end;
 get_addrs_by_family_aux(inet_and_inet6, NumAddrs) ->
-    catch {ok, [case get_addrs_by_family_aux(Family, NumAddrs) of
-		    {ok, Addrs}     -> Addrs;
-		    {error, Reason} -> throw({error, Reason})
-		end || Family <- [inet, inet6]]}.
+    try [case get_addrs_by_family_aux(Family, NumAddrs) of
+             {ok, Addrs}     -> Addrs;
+             {error, Reason} -> throw({error, Reason})
+         end || Family <- [inet, inet6]]
+    catch
+        throw:{error, _} = ERROR ->
+            ERROR
+    end.
 
 filter_addrs_by_family(IfAddrs, Family) ->
     lists:flatten([[Addr || {addr, Addr} <- Info,
-- 
2.26.2

Places

File 2232-kernel-sctp-test-More-nxdomain-tweaking.patch of Package erlang (Revision a7029ee97b719a45764ae3b135bbdda2)

Places