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

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

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index b2e3327fd56b..0a7d7d128e4c 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -2414,15 +2414,20 @@ class BasicConfigTest(unittest.TestCase):
 
     def setUp(self):
         super(BasicConfigTest, self).setUp()
-        handlers = logging.root.handlers
-        self.addCleanup(lambda: setattr(logging.root, 'handlers', handlers))
+        self.handlers = logging.root.handlers
+        self.addCleanup(self.cleanup)
         logging.root.handlers = []
 
     def tearDown(self):
-        logging.shutdown()
+        for h in logging.root.handlers[:]:
+            logging.root.removeHandler(h)
+            h.close()
         super(BasicConfigTest, self).tearDown()
 
-    @unittest.skipIf(True, "test disabled, issue #11557")
+    def cleanup(self):
+        setattr(logging.root, 'handlers', self.handlers)
+
+    #@unittest.skipIf(True, "test disabled, issue #11557")
     def test_no_kwargs(self):
         logging.basicConfig()