From 3def7e0f01aa9706b95947fcd98c9ef693481d00 Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Wed, 20 Apr 2011 10:58:06 +0100 Subject: Attempt fix of #11557 by changing teardown logic. --- Lib/test/test_logging.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index b2e3327..0a7d7d1 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() -- cgit v0.12