Issue #12167: packaging.tests.support, LoggingCatcher restores correctly the

log level. Avoid also calls to .addCleanup() in setUp().

diff --git a/Lib/packaging/tests/support.py b/Lib/packaging/tests/support.py
index 0c85b5d697b1983aa8044a21c3f670a28cf2b8bb..6d60b9e9a79085f76bb678196d5d1fe1b1d20e44 100644 (file)
--- a/Lib/packaging/tests/support.py
+++ b/Lib/packaging/tests/support.py
@@ -71,8 +71,8 @@ class LoggingCatcher:
     def setUp(self):
         super(LoggingCatcher, self).setUp()
         self.loghandler = handler = _TestHandler()
+        self.old_level = logger.level
         logger.addHandler(handler)
-        self.addCleanup(logger.setLevel, logger.level)
         logger.setLevel(logging.DEBUG)  # we want all messages
 
     def tearDown(self):
@@ -84,6 +84,7 @@ class LoggingCatcher:
         for ref in weakref.getweakrefs(handler):
             logging._removeHandlerRef(ref)
         del self.loghandler
+        logger.setLevel(self.old_level)
         super(LoggingCatcher, self).tearDown()
 
     def get_logs(self, *levels):