From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 14 Sep 2013 19:16:39 +0000 (+0200)
Subject: Avoid test_logging failure when run after test_unittest, by renaming a conflicting... 
X-Git-Tag: v3.4.0a3~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04d4d6a3aa5ffc64ab691a02692afc784dd3f5a2;p=thirdparty%2FPython%2Fcpython.git

Avoid test_logging failure when run after test_unittest, by renaming a conflicting logger
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index eed67d09b8bb..85e1898b6cdd 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1345,7 +1345,7 @@ class ConfigFileTest(BaseTest):
 
     def test_logger_disabling(self):
         self.apply_config(self.disable_test)
-        logger = logging.getLogger('foo')
+        logger = logging.getLogger('some_pristine_logger')
         self.assertFalse(logger.disabled)
         self.apply_config(self.disable_test)
         self.assertTrue(logger.disabled)