Merge "Restore proper LoggerTestCase"

1 files changed, 8 insertions, 6 deletions

diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py
index b64fe8c..2530339 100644
--- a/tests/unit/test_log.py
+++ b/tests/unit/test_log.py
@@ -43,13 +43,15 @@ class LoggerTestCase(test_utils.BaseTestCase):
 
     def test_will_be_verbose_if_verbose_flag_set(self):
         self.config(verbose=True)
-        log.setup()
-        self.assertEqual(logging.DEBUG, self.log.logger.getEffectiveLevel())
+        log.setup("test_is_verbose")
+        logger = logging.getLogger("test_is_verbose")
+        self.assertEqual(logging.DEBUG, logger.getEffectiveLevel())
 
     def test_will_not_be_verbose_if_verbose_flag_not_set(self):
         self.config(verbose=False)
-        log.setup()
-        self.assertEqual(logging.INFO, self.log.logger.getEffectiveLevel())
+        log.setup("test_is_not_verbose")
+        logger = logging.getLogger("test_is_not_verbose")
+        self.assertEqual(logging.INFO, logger.getEffectiveLevel())
 
     def test_no_logging_via_module(self):
         for func in ('critical', 'error', 'exception', 'warning', 'warn',
@@ -101,9 +103,9 @@ class PublishErrorsHandlerTestCase(test_utils.BaseTestCase):
         self.assertTrue(self.stub_flg)
 
 
-class LoggerTestCase(test_utils.BaseTestCase):
+class LogLevelTestCase(test_utils.BaseTestCase):
     def setUp(self):
-        super(LoggerTestCase, self).setUp()
+        super(LogLevelTestCase, self).setUp()
         levels = CONF.default_log_levels
         levels.append("nova-test=AUDIT")
         self.config(default_log_levels=levels,