mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-09 10:37:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #10626: test_logging now preserves logger disabled states.

Browse source
This commit is contained in:
Vinay Sajip 2010-12-27 14:31:52 +00:00
parent 60b4df15d6
commit 7b60f4e949
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_logging.py
View file

@ -67,8 +67,12 @@ class BaseTest(unittest.TestCase):
try: try:
self.saved_handlers = logging._handlers.copy() self.saved_handlers = logging._handlers.copy()
self.saved_handler_list = logging._handlerList[:] self.saved_handler_list = logging._handlerList[:]
self.saved_loggers = logger_dict.copy() self.saved_loggers = saved_loggers = logger_dict.copy()
self.saved_level_names = logging._levelNames.copy() self.saved_level_names = logging._levelNames.copy()
self.logger_states = logger_states = {}
for name in saved_loggers:
logger_states[name] = getattr(saved_loggers[name],
'disabled', None)
finally: finally:
logging._releaseLock() logging._releaseLock()
@ -112,6 +116,10 @@ class BaseTest(unittest.TestCase):
loggerDict = logging.getLogger().manager.loggerDict loggerDict = logging.getLogger().manager.loggerDict
loggerDict.clear() loggerDict.clear()
loggerDict.update(self.saved_loggers) loggerDict.update(self.saved_loggers)
logger_states = self.logger_states
for name in self.logger_states:
if logger_states[name] is not None:
self.saved_loggers[name].disabled = logger_states[name]
finally: finally:
logging._releaseLock() logging._releaseLock()