From c76cb9c9cbfbbff28ea1b07e40f82526ba047d28 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 9 Aug 2026 14:04:42 +0300
Subject: [PATCH] gh-155423: Make BaseFileTest.tearDown() in test_logging
 robust

Always call BaseTest.tearDown(), which removes the handlers added by
setUp(), even if unlinking the log files fails.  Tolerate an already
removed file.
---
 Lib/test/test_logging.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index d74670609ec0199..90c38557d2e21b4 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -6446,11 +6446,12 @@ def setUp(self):
         self.rmfiles = []
 
     def tearDown(self):
-        for fn in self.rmfiles:
-            os.unlink(fn)
-        if os.path.exists(self.fn):
-            os.unlink(self.fn)
-        BaseTest.tearDown(self)
+        try:
+            for fn in self.rmfiles:
+                os_helper.unlink(fn)
+            os_helper.unlink(self.fn)
+        finally:
+            BaseTest.tearDown(self)
 
     def assertLogFile(self, filename):
         "Assert a log file is there and register it for deletion"