summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-01-30 06:46:44 +0000
committerGerrit Code Review <review@openstack.org>2018-01-30 06:46:44 +0000
commite5ac99afb00a3908244280357296390d93914195 (patch)
tree39dfa84ad77476927d054fe11ff1c732dee2eb97
parent35cabf82f2e9af3ff09a2ec53c6d73e4e9bbd48c (diff)
parent09ffdccb617023abdc679c00f8c29d83632cab1c (diff)
downloadoslo-log-e5ac99afb00a3908244280357296390d93914195.tar.gz
Merge "update structured logging tests to prove context id is included"
-rw-r--r--oslo_log/tests/unit/test_log.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py
index c827057..553ad10 100644
--- a/oslo_log/tests/unit/test_log.py
+++ b/oslo_log/tests/unit/test_log.py
@@ -448,6 +448,10 @@ class JSONFormatterTestCase(LogTestBase):
self.assertEqual(ctx.user_name, context['user_name'])
self.assertEqual(ctx.project_name, context['project_name'])
self.assertEqual('test-json', data['name'])
+ self.assertIn('request_id', context)
+ self.assertEqual(ctx.request_id, context['request_id'])
+ self.assertIn('global_request_id', context)
+ self.assertEqual(ctx.global_request_id, context['global_request_id'])
self.assertEqual(test_msg % test_data, data['message'])
self.assertEqual(test_msg, data['msg'])
@@ -634,6 +638,12 @@ class FluentFormatterTestCase(LogTestBase):
self.assertEqual(local_context.user, context['user'])
self.assertEqual('test-fluent', data['name'])
+ self.assertIn('request_id', context)
+ self.assertEqual(local_context.request_id, context['request_id'])
+ self.assertIn('global_request_id', context)
+ self.assertEqual(local_context.global_request_id,
+ context['global_request_id'])
+
self.assertEqual(test_msg % test_data, data['message'])
self.assertEqual('test_log.py', data['filename'])