File 5035-kernel-test-Replaced-use-of-catch-with-try-catch-gen.patch of Package erlang
From 378bcd062b7be45babdd5ac6136c9a1dee6c82bf Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 4 Mar 2026 10:33:59 +0100
Subject: [PATCH 5/8] [kernel|test] Replaced use of 'catch' with 'try catch'
(gen sctp)
---
lib/kernel/test/gen_sctp_SUITE.erl | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 5cb37c051e..1a9091c9f6 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -2255,8 +2255,8 @@ recv_close(Config) when is_list(Config) ->
%% Make sure it does not die for some other reason...
?P("unexpected reader termination:"
"~n ~p", [PreReason]),
- (catch gen_sctp:close(S)),
- (catch gen_sctp:close(C)),
+ ?CATCH_AND_IGNORE( gen_sctp:close(S) ),
+ ?CATCH_AND_IGNORE( gen_sctp:close(C) ),
ct:fail("Unexpected pre close from reader (~p): ~p",
[Pid, PreReason]);
{Pid, ready} ->
@@ -2267,8 +2267,8 @@ recv_close(Config) when is_list(Config) ->
%% how long it will take to iterate through all the
%% addresses of a host...
?P("reader ready timeout"),
- (catch gen_sctp:close(S)),
- (catch gen_sctp:close(C)),
+ ?CATCH_AND_IGNORE( gen_sctp:close(S) ),
+ ?CATCH_AND_IGNORE( gen_sctp:close(C) ),
ct:fail("Unexpected pre close timeout (~p)", [Pid])
end,
@@ -2277,8 +2277,8 @@ recv_close(Config) when is_list(Config) ->
Any ->
?P("Received unexpected message: "
"~n ~p", [Any]),
- (catch gen_sctp:close(S)),
- (catch gen_sctp:close(C)),
+ ?CATCH_AND_IGNORE( gen_sctp:close(S) ),
+ ?CATCH_AND_IGNORE( gen_sctp:close(C) ),
ct:fail("Unexpected message: ~p", [Any])
after 5000 ->
ok
@@ -2290,23 +2290,23 @@ recv_close(Config) when is_list(Config) ->
receive
{'DOWN', MRef, process, Pid, {error, closed}} ->
?P("expected reader termination result"),
- (catch gen_sctp:close(C)),
+ ?CATCH_AND_IGNORE( gen_sctp:close(C) ),
ok;
{'DOWN', MRef, process, Pid, PostReason} ->
?P("unexpected reader termination: "
"~n ~p", [PostReason]),
- (catch gen_sctp:close(C)),
+ ?CATCH_AND_IGNORE( gen_sctp:close(C) ),
ct:fail("Unexpected post close from reader (~p): ~p",
[Pid, PostReason])
after 5000 ->
?P("unexpected reader termination timeout"),
demonitor(MRef, [flush]),
- (catch gen_sctp:close(C)),
+ ?CATCH_AND_IGNORE( gen_sctp:close(C) ),
exit(Pid, kill),
ct:fail("Reader (~p) termination timeout", [Pid])
end,
?P("close client socket"),
- (catch gen_sctp:close(C)),
+ ?CATCH_AND_IGNORE( gen_sctp:close(C) ),
?P("done"),
ok.
@@ -2544,7 +2544,7 @@ do_simple_sockaddr_send_recv(#{family := _Fam} = SockAddr, _) ->
receive
{die, Self} ->
?P("[server] terminating"),
- (catch gen_tcp:close(Sock)),
+ ?CATCH_AND_IGNORE( gen_tcp:close(Sock) ),
exit(normal)
end
end,
@@ -2669,8 +2669,8 @@ do_simple_sockaddr_send_recv(#{family := _Fam} = SockAddr, _) ->
end,
?P("cleanup"),
- (catch gen_sctp:close(CSock1)),
- (catch gen_sctp:close(CSock2)),
+ ?CATCH_AND_IGNORE( gen_sctp:close(CSock1) ),
+ ?CATCH_AND_IGNORE( gen_sctp:close(CSock2) ),
?P("done"),
ok.
--
2.51.0