From cbeca5e1533da29001984a0a0880cc23860a08ed Mon Sep 17 00:00:00 2001 From: John Downey Date: Wed, 11 Mar 2026 19:20:51 -0500 Subject: [PATCH 1/2] Add small timeout to fix test flakyness --- erts/test/run_erl_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erts/test/run_erl_SUITE.erl b/erts/test/run_erl_SUITE.erl index 20622c222e62..f1797b209fd7 100644 --- a/erts/test/run_erl_SUITE.erl +++ b/erts/test/run_erl_SUITE.erl @@ -104,7 +104,7 @@ count_new_lines(P, N) -> receive {P,{data,S}} -> count_new_lines(P, count_new_lines_1(S, N)) - after 0 -> + after 10 -> N end. From 72d6da93f1a520789b8c5ce13a1e1eac420e9f28 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Wed, 25 Feb 2026 15:11:51 -0500 Subject: [PATCH 2/2] remove unnecessary 1 second sleep from user_sup terminate --- lib/kernel/src/user_sup.erl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/kernel/src/user_sup.erl b/lib/kernel/src/user_sup.erl index 5e9e299bdaf7..5507f47570eb 100644 --- a/lib/kernel/src/user_sup.erl +++ b/lib/kernel/src/user_sup.erl @@ -82,16 +82,9 @@ relay1(Pid) -> relay1(Pid) end. - -%%----------------------------------------------------------------- -%% Sleep a while in order to let user write all (some) buffered -%% information before termination. -%%----------------------------------------------------------------- - -spec terminate(term(), pid()) -> 'ok'. terminate(_Reason, UserPid) -> - receive after 1000 -> ok end, exit(UserPid, kill), ok.