[3.13] gh-155423: Make BaseFileTest.tearDown() in test_logging robust (GH-155424) (GH-155442)

https://github.com/python/cpython/commit/def15752feac67b49870a5fba78e5c3f1f6c0858
commit: def15752feac67b49870a5fba78e5c3f1f6c0858
branch: 3.13
author: Miss Islington (bot) <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2026-08-09T17:24:14Z
summary:

[3.13] gh-155423: Make BaseFileTest.tearDown() in test_logging robust (GH-155424) (GH-155442)

Always call BaseTest.tearDown(), which removes the handlers added by
setUp(), even if unlinking the log files fails.  Tolerate an already
removed file.
(cherry picked from commit 6f7fb6c95ba9e4d5c1b86d0d4ad83d0cd495976b)

Co-authored-by: Serhiy Storchaka <[email protected]>

files:
M Lib/test/test_logging.py

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 5af550ddaf8f89a..dca2f542166234a 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -6244,11 +6244,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"

_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]