File 5034-kernel-test-Replaced-use-of-catch-with-try-catch-soc.patch of Package erlang
From eef6a7803dbb5523e69a582281b277e4ae4de128 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 4 Mar 2026 08:41:15 +0100
Subject: [PATCH 4/8] [kernel|test] Replaced use of 'catch' with 'try catch'
(socket)
---
lib/kernel/test/socket_SUITE.erl | 139 ++++++++++++++---------
lib/kernel/test/socket_api_SUITE.erl | 94 +++++++--------
lib/kernel/test/socket_traffic_SUITE.erl | 54 ++++-----
lib/kernel/test/socket_ttest_SUITE.erl | 6 +-
4 files changed, 160 insertions(+), 133 deletions(-)
diff --git a/lib/kernel/test/socket_SUITE.erl b/lib/kernel/test/socket_SUITE.erl
index b4955723c3..0d2c04654b 100644
--- a/lib/kernel/test/socket_SUITE.erl
+++ b/lib/kernel/test/socket_SUITE.erl
@@ -496,7 +494,8 @@ end_per_suite(Config0) ->
%% Stop the local monitor
kernel_test_sys_monitor:stop(),
- (catch ?LOGGER:stop()),
+ ?CATCH_AND_IGNORE( ?LOGGER:stop() ),
+ %%(catch ?LOGGER:stop()),
Config1 = ?KLIB:end_per_suite(Config0),
@@ -509,9 +508,8 @@ init_per_group(GroupName, Config)
when (GroupName =:= sc_remote_close) orelse
(GroupName =:= sc_remote_shutdown) orelse
(GroupName =:= traffic) ->
- io:format("init_per_group(~w) -> entry with"
- "~n Config: ~p"
- "~n", [GroupName, Config]),
+ ?P("~s(~w) -> entry with"
+ "~n Config: ~p", [?FUNCTION_NAME, GroupName, Config]),
%% Maybe we should skip the entire suite for this platform,
%% but for now we just skip these groups, which seem to
%% have problems (node start).
@@ -526,9 +524,8 @@ init_per_group(GroupName, Config)
SKIP
end;
init_per_group(ttest = _GroupName, Config) ->
- io:format("init_per_group(~w) -> entry with"
- "~n Config: ~p"
- "~n", [_GroupName, Config]),
+ ?P("~s(~w) -> entry with"
+ "~n Config: ~p", [?FUNCTION_NAME, _GroupName, Config]),
case ttest_condition(Config) of
ok ->
ttest_manager_start(),
@@ -629,27 +627,39 @@ reg_s_single_open_and_close_and_count() ->
%% Make sure we dont count them when we test.
Existing = socket:which_sockets(),
N = length(Existing),
- SupportsIPV6 =
- case (catch has_support_ipv6()) of
- ok ->
- true;
- _ ->
- false
- end,
- SupportsLOCAL =
- case (catch has_support_unix_domain_socket()) of
- ok ->
- true;
- _ ->
- false
- end,
- SupportsSCTP =
- case (catch has_support_sctp()) of
- ok ->
- true;
- _ ->
- false
- end,
+ HasSupport =
+ fun(F) when is_function(F, 0) ->
+ try F() of
+ ok ->
+ true;
+ _ ->
+ false
+ catch
+ _:_ ->
+ false
+ end
+ end,
+ SupportsIPV6 = HasSupport(fun has_support_ipv6/0),
+ %% try has_support_ipv6() of
+ %% ok ->
+ %% true;
+ %% _ ->
+ %% false
+ %% end,
+ SupportsLOCAL = HasSupport(fun has_support_unix_domain_socket/0),
+ %% case (catch has_support_unix_domain_socket()) of
+ %% ok ->
+ %% true;
+ %% _ ->
+ %% false
+ %% end,
+ SupportsSCTP = HasSupport(fun has_support_sctp/0),
+ %% case (catch has_support_sctp()) of
+ %% ok ->
+ %% true;
+ %% _ ->
+ %% false
+ %% end,
InitSockInfos =
[
{inet, stream, tcp},
@@ -692,7 +702,8 @@ reg_s_single_open_and_close_and_count() ->
#{use_registry => false}) of
{ok, S} ->
?P("test open sctp socket: success"),
- (catch socket:close(S)),
+ ?CATCH_AND_IGNORE( socket:close(S) ),
+ %% (catch socket:close(S)),
[
{inet, seqpacket, sctp},
{inet, seqpacket, sctp}
@@ -719,7 +730,8 @@ reg_s_single_open_and_close_and_count() ->
#{use_registry => false}) of
{ok, S6} ->
?P("test open sctp socket: success"),
- (catch socket:close(S6)),
+ ?CATCH_AND_IGNORE( socket:close(S6) ),
+ %% (catch socket:close(S6)),
[
{inet6, seqpacket, sctp},
{inet6, seqpacket, sctp}
@@ -5778,7 +5790,8 @@ mon_closed_socket(InitState) ->
cmd => fun(#{tester := Tester,
sock := Sock} = State) ->
?SEV_ANNOUNCE_READY(Tester, init, Sock),
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
+ %% (catch socket:close(Sock)),
{ok, maps:remove(sock, State)}
end},
@@ -7060,7 +7073,8 @@ sc_lc_receive_response_udp(InitState) ->
{error, eafnosupport = Reason} ->
?SEV_IPRINT("Failed get socket name: "
"~n ~p", [Reason]),
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
+ %% (catch socket:close(Sock)),
{skip, Reason};
{error, Reason} = ERROR ->
?SEV_EPRINT("Failed get socket name: "
@@ -7666,7 +7680,8 @@ sc_lc_acceptor_response_tcp(InitState) ->
ok;
{ok, Sock} ->
?SEV_EPRINT("unexpected success"),
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
+ %% (catch socket:close(Sock)),
{error, unexpected_success};
{error, _} = ERROR ->
ERROR
@@ -11993,35 +12008,41 @@ otp18240_client(ID, Domain, Proto, Addr, PortNo) ->
{ok, Data} ->
i("[connector ~w] received unexpected data: "
"~n ~p", [ID, Data]),
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
+ %% (catch socket:close(Sock)),
exit('unexpected data');
{error, closed} ->
i("[connector ~w] expected socket close", [ID]);
{error, Reason} ->
i("[connector ~w] unexpected error when reading: "
"~n ~p", [ID, Reason]),
- (catch socket:close(Sock))
+ ?CATCH_AND_IGNORE( socket:close(Sock) )
+ %% (catch socket:close(Sock))
end;
{error, {completion_status, #{info := invalid_netname = R} = Reason}} ->
i("[connector ~w] failed connecting: "
"~n ~p", [ID, Reason]),
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
+ %% (catch socket:close(Sock)),
exit({skip, R});
{error, {completion_status, invalid_netname = Reason}} ->
i("[connector ~w] failed connecting: "
"~n ~p", [ID, Reason]),
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
+ %% (catch socket:close(Sock)),
exit({skip, Reason});
{error, enetunreach = Reason} ->
i("[connector ~w] failed connecting: "
"~n ~p", [ID, Reason]),
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
+ %% (catch socket:close(Sock)),
exit({skip, Reason});
{error, Reason} ->
i("[connector ~w] failed connecting: "
"~n ~p", [ID, Reason]),
- (catch socket:close(Sock))
+ ?CATCH_AND_IGNORE( socket:close(Sock) )
+ %% (catch socket:close(Sock))
end,
i("[connector ~w] done", [ID]),
ok.
@@ -12138,7 +12159,8 @@ do_otp18635(_) ->
receive
{Parent, terminate} ->
?P("[connector] terminate - close socket"),
- (catch socket:close(CSock)),
+ ?CATCH_AND_IGNORE( socket:close(CSock) ),
+ %% (catch socket:close(CSock)),
exit(normal)
end
end),
@@ -12276,7 +12298,8 @@ do_otp19063(_) ->
receive
{Parent, terminate} ->
?P("[connector] terminate - close socket"),
- (catch socket:close(CSock1)),
+ ?CATCH_AND_IGNORE( socket:close(CSock1) ),
+ %% (catch socket:close(CSock1)),
exit(normal)
end
end),
--
2.51.0
