Merge "Support for lazily instantiated loggers"

1 files changed, 19 insertions, 4 deletions

diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py
index 4241e2e..a80b872 100644
--- a/tests/unit/test_log.py
+++ b/tests/unit/test_log.py
@@ -20,17 +20,20 @@ def _fake_context():
     return context.RequestContext(1, 1)
 
 
-class LoggerTestCase(test_utils.BaseTestCase):
+class CommonLoggerTestsMixIn(object):
+    """These tests are shared between LoggerTestCase and
+    LazyLoggerTestCase.
+    """
+
     def setUp(self):
-        super(LoggerTestCase, self).setUp()
+        super(CommonLoggerTestsMixIn, self).setUp()
 
         # common context has different fields to the defaults in log.py
         self.config(logging_context_format_string='%(asctime)s %(levelname)s '
                                                   '%(name)s [%(request_id)s '
                                                   '%(user)s %(tenant)s] '
                                                   '%(message)s')
-
-        self.log = log.getLogger()
+        self.log = None
 
     def test_handlers_have_legacy_formatter(self):
         formatters = []
@@ -73,6 +76,18 @@ class LoggerTestCase(test_utils.BaseTestCase):
             self.assertRaises(AttributeError, getattr, log, func)
 
 
+class LoggerTestCase(CommonLoggerTestsMixIn, test_utils.BaseTestCase):
+    def setUp(self):
+        super(LoggerTestCase, self).setUp()
+        self.log = log.getLogger()
+
+
+class LazyLoggerTestCase(CommonLoggerTestsMixIn, test_utils.BaseTestCase):
+    def setUp(self):
+        super(LazyLoggerTestCase, self).setUp()
+        self.log = log.getLazyLogger()
+
+
 class LogHandlerTestCase(test_utils.BaseTestCase):
     def test_log_path_logdir(self):
         self.config(log_dir='/some/path', log_file=None)