File 5033-kernel-test-Replaced-use-of-catch-with-try-catch-soc.patch of Package erlang
From 09d012b9bdd24151d191ef9bdc4672e153a209df Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 4 Mar 2026 09:08:01 +0100
Subject: [PATCH 3/8] [kernel|test] Replaced use of 'catch' with 'try catch'
(socket ttest)
---
lib/kernel/test/socket_test_evaluator.erl | 4 ++--
lib/kernel/test/socket_test_ttest.hrl | 5 +++++
.../test/socket_test_ttest_tcp_client.erl | 4 ++--
.../test/socket_test_ttest_tcp_server.erl | 20 +++++++++----------
.../test/socket_test_ttest_tcp_socket.erl | 12 ++++++-----
5 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/lib/kernel/test/socket_test_ttest.hrl b/lib/kernel/test/socket_test_ttest.hrl
index 2a03e3ccfe..7742187f8d 100644
--- a/lib/kernel/test/socket_test_ttest.hrl
+++ b/lib/kernel/test/socket_test_ttest.hrl
@@ -31,4 +31,9 @@
-define(SLEEP(T), receive after T -> ok end).
+-define(CATCH_AND_IGNORE(_X_),
+ try _X_ catch _:_ -> ignore end).
+-define(CATCH_AND_RETURN(_X_),
+ try _X_ catch __C__:__E__ -> {error, {catched, __C__, __E__}} end).
+
-endif. % -ifdef(socket_test_ttest).
diff --git a/lib/kernel/test/socket_test_ttest_tcp_client.erl b/lib/kernel/test/socket_test_ttest_tcp_client.erl
index a66b9ce241..6bb738f2aa 100644
--- a/lib/kernel/test/socket_test_ttest_tcp_client.erl
+++ b/lib/kernel/test/socket_test_ttest_tcp_client.erl
@@ -278,7 +278,7 @@ init(Quiet,
if not Quiet -> ?I("close socket");
true -> ok
end,
- (catch Mod:close(Sock)),
+ ?CATCH_AND_IGNORE( Mod:close(Sock) ),
if not Quiet -> ?I("done");
true -> ok
end,
diff --git a/lib/kernel/test/socket_test_ttest_tcp_server.erl b/lib/kernel/test/socket_test_ttest_tcp_server.erl
index 47b273d8c3..1de2d21dba 100644
--- a/lib/kernel/test/socket_test_ttest_tcp_server.erl
+++ b/lib/kernel/test/socket_test_ttest_tcp_server.erl
@@ -175,7 +175,7 @@ server_init(Starter, Parent, Transport, Active) ->
hcnt => 0
});
{error, PReason} ->
- (catch Mod:close(LSock)),
+ ?CATCH_AND_IGNORE( Mod:close(LSock) ),
exit({port, PReason})
end;
{error, LReason} ->
@@ -204,7 +204,7 @@ server_accept(#{mod := Mod, lsock := LSock} = State, Timeout) ->
{error, timeout} when (Timeout =/= nowait) ->
State;
{error, AReason} ->
- (catch Mod:close(LSock)),
+ ?CATCH_AND_IGNORE( Mod:close(LSock) ),
exit({accept, AReason})
end.
@@ -230,8 +230,8 @@ server_handle_accepted(#{mod := Mod,
Handlers2 = [Pid | Handlers],
State#{handlers => Handlers2};
{error, CPReason} ->
- (catch Mod:close(Sock)),
- (catch Mod:close(LSock)),
+ ?CATCH_AND_IGNORE( Mod:close(Sock) ),
+ ?CATCH_AND_IGNORE( Mod:close(LSock) ),
exit({controlling_process, CPReason})
end.
@@ -280,7 +280,7 @@ server_handle_message(#{mod := Mod,
handler_stop(P)
end, H),
?I("try close listen socket"),
- (catch Mod:close(LSock)),
+ ?CATCH_AND_IGNORE( Mod:close(LSock) ),
?I("stopped"),
exit(normal);
@@ -550,7 +550,7 @@ handler_send_reply(Mod, Sock, ID, Data) ->
ok ->
ok;
{error, Reason} ->
- (catch Mod:close(Sock)),
+ ?CATCH_AND_IGNORE( Mod:close(Sock) ),
exit({send, Reason})
end.
@@ -563,7 +563,7 @@ handler_done(#{start := Start,
sock := Sock,
mcnt := MCnt,
bcnt := BCnt}, Stop) ->
- (catch Mod:close(Sock)),
+ ?CATCH_AND_IGNORE( Mod:close(Sock) ),
exit({done, ?TDIFF(Start, Stop), MCnt, BCnt}).
@@ -572,14 +572,14 @@ handler_handle_message(#{mod := Mod, sock := Sock, parent := Parent} = State) ->
{?MODULE, Ref, Parent, stop} ->
?I("handler: received stop from parent ~p", [Parent]),
reply(Parent, Ref, ok),
- (catch Mod:close(Sock)),
+ ?CATCH_AND_IGNORE( Mod:close(Sock) ),
?I("handler: stopped"),
exit(normal);
{'EXIT', Parent, Reason} ->
?E("handler: parent ~p exit: "
"~n ~p", [Parent, Reason]),
- (catch Mod:close(Sock)),
+ ?CATCH_AND_IGNORE( Mod:close(Sock) ),
exit({parent_exit, Reason})
after 0 ->
State
diff --git a/lib/kernel/test/socket_test_ttest_tcp_socket.erl b/lib/kernel/test/socket_test_ttest_tcp_socket.erl
index b1eb60e7a3..85113eef69 100644
--- a/lib/kernel/test/socket_test_ttest_tcp_socket.erl
+++ b/lib/kernel/test/socket_test_ttest_tcp_socket.erl
@@ -3,7 +3,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2018-2025. All Rights Reserved.
+%% Copyright Ericsson AB 2018-2026. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -44,6 +44,8 @@
]).
+-include("socket_test_ttest.hrl").
+
-define(LIB, socket_test_lib).
-define(READER_RECV_TIMEOUT, 1000).
@@ -208,7 +210,7 @@ do_connect(LocalSA, ServerSA, Cleanup, #{domain := Domain,
ok ->
ok;
{error, BReason} ->
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
Cleanup(),
throw({error, {bind, BReason}})
end,
@@ -216,7 +218,7 @@ do_connect(LocalSA, ServerSA, Cleanup, #{domain := Domain,
ok ->
ok;
{error, CReason} ->
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
Cleanup(),
throw({error, {connect, CReason}})
end,
@@ -306,7 +308,7 @@ do_listen(SA,
ok ->
ok;
{error, BReason} ->
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
Cleanup(),
throw({error, {bind, BReason}})
end,
@@ -314,7 +316,7 @@ do_listen(SA,
ok ->
ok;
{error, LReason} ->
- (catch socket:close(Sock)),
+ ?CATCH_AND_IGNORE( socket:close(Sock) ),
Cleanup(),
throw({error, {listen, LReason}})
end,
--
2.51.0
