From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 20 Apr 2011 10:50:56 +0000 (+0100)
Subject: Attempt fix of #11557 by changing setup/teardown logic.
X-Git-Tag: v3.3.0a1~2545
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95bf50416e428fc266cbadebb89c5d56b6a9cd55;p=python

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

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 0a7d7d128e..d7f9306b63 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -2410,11 +2410,13 @@ class ModuleLevelMiscTest(BaseTest):
 
 class BasicConfigTest(unittest.TestCase):
 
-    """Tets suite for logging.basicConfig."""
+    """Test suite for logging.basicConfig."""
 
     def setUp(self):
         super(BasicConfigTest, self).setUp()
         self.handlers = logging.root.handlers
+        self.saved_handlers = logging._handlers.copy()
+        self.saved_handler_list = logging._handlerList[:]
         self.addCleanup(self.cleanup)
         logging.root.handlers = []
 
@@ -2426,6 +2428,9 @@ class BasicConfigTest(unittest.TestCase):
 
     def cleanup(self):
         setattr(logging.root, 'handlers', self.handlers)
+        logging._handlers.clear()
+        logging._handlers.update(self.saved_handlers)
+        logging._handlerList[:] = self.saved_handler_list
 
     #@unittest.skipIf(True, "test disabled, issue #11557")
     def test_no_kwargs(self):