Merge "Fix the log test so it uses the available context fields."

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py
index 2530339..f9c6e4c 100644
--- a/tests/unit/test_log.py
+++ b/tests/unit/test_log.py
@@ -22,6 +22,13 @@ def _fake_context():
 class LoggerTestCase(test_utils.BaseTestCase):
     def setUp(self):
         super(LoggerTestCase, 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()
 
     def test_handlers_have_legacy_formatter(self):