From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
Date: Sat, 19 Mar 2011 21:13:34 +0000 (+0000)
Subject: test refactoring: clear global babel logger handlers to decrease test interdependenci... 
X-Git-Tag: 1.0~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33245d76860fbfb79392b9ee87c30eef218df8d6;p=thirdparty%2Fbabel.git

test refactoring: clear global babel logger handlers to decrease test interdependencies (follow-up on #227)
---

diff --git a/babel/messages/tests/frontend.py b/babel/messages/tests/frontend.py
index 5526ca6c..7892b75e 100644
--- a/babel/messages/tests/frontend.py
+++ b/babel/messages/tests/frontend.py
@@ -513,13 +513,7 @@ class CommandLineInterfaceTestCase(unittest.TestCase):
         sys.stderr = StringIO()
         os.chdir(self.datadir)
         
-        # Logging handlers will be reused if possible (#227). This breaks the 
-        # implicit assumption that our newly created StringIO for sys.stderr 
-        # contains the console output. Removing the old handler ensures that a
-        # new handler with our new StringIO instance will be used.
-        log = logging.getLogger('babel')
-        for handler in log.handlers:
-            log.removeHandler(handler)
+        self._remove_log_handlers()
         self.cli = frontend.CommandLineInterface()
 
     def tearDown(self):
@@ -531,6 +525,16 @@ class CommandLineInterfaceTestCase(unittest.TestCase):
             locale_dir = os.path.join(self.datadir, 'project', 'i18n', dirname)
             if os.path.isdir(locale_dir):
                 shutil.rmtree(locale_dir)
+        self._remove_log_handlers()
+
+    def _remove_log_handlers(self):
+        # Logging handlers will be reused if possible (#227). This breaks the 
+        # implicit assumption that our newly created StringIO for sys.stderr 
+        # contains the console output. Removing the old handler ensures that a
+        # new handler with our new StringIO instance will be used.
+        log = logging.getLogger('babel')
+        for handler in log.handlers:
+            log.removeHandler(handler)
 
     def test_usage(self):
         try: