From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 20 Apr 2011 11:20:44 +0000 (+0100)
Subject: Attempt fix of #11557 by refining setup/teardown logic.
X-Git-Tag: v3.3.0a1~2544
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e42f9e4c007d73d85561aeb1104935a64b3a54a;p=thirdparty%2FPython%2Fcpython.git

Attempt fix of #11557 by refining setup/teardown logic.
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index d7f9306b637f..33bd845f0730 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -2417,6 +2417,7 @@ class BasicConfigTest(unittest.TestCase):
         self.handlers = logging.root.handlers
         self.saved_handlers = logging._handlers.copy()
         self.saved_handler_list = logging._handlerList[:]
+        self.original_logging_level = logging.root.level
         self.addCleanup(self.cleanup)
         logging.root.handlers = []
 
@@ -2431,6 +2432,7 @@ class BasicConfigTest(unittest.TestCase):
         logging._handlers.clear()
         logging._handlers.update(self.saved_handlers)
         logging._handlerList[:] = self.saved_handler_list
+        logging.root.level = self.original_logging_level
 
     #@unittest.skipIf(True, "test disabled, issue #11557")
     def test_no_kwargs(self):