openstack/oslo.log
Code Issues Proposed changes

Merge "Remove usage of deprecated RequestContext attributes"

Browse Source
This commit is contained in:
Zuul 2024-09-21 07:45:52 +00:00 committed by Gerrit Code Review
commit 8c5ae4cedd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oslo_log/tests/unit/test_log.py
View File

@ -71,7 +71,7 @@ def _fake_context():
ctxt = context.RequestContext(user_id="myuser", ctxt = context.RequestContext(user_id="myuser",
user_name="myuser", user_name="myuser",
system_scope="myscope", system_scope="myscope",
domain="mydomain", domain_id="mydomain",
project_id="mytenant", project_id="mytenant",
project_name="mytenant", project_name="mytenant",
project_domain_id="mydomain", project_domain_id="mydomain",
@ -940,8 +940,9 @@ class ContextFormatterTestCase(LogTestBase):
message = 'test' message = 'test'
self.log.info(message, context=ctxt) self.log.info(message, context=ctxt)
expected = ("HAS CONTEXT [%s %s %s %s %s %s %s]: %s\n" % expected = ("HAS CONTEXT [%s %s %s %s %s %s %s]: %s\n" %
(ctxt.request_id, ctxt.user, ctxt.project_id, ctxt.domain, (ctxt.request_id, ctxt.user_id, ctxt.project_id,
ctxt.system_scope, ctxt.user_domain, ctxt.project_domain, ctxt.domain_id, ctxt.system_scope,
ctxt.user_domain_id, ctxt.project_domain_id,
str(message))) str(message)))
self.assertEqual(expected, self.stream.getvalue()) self.assertEqual(expected, self.stream.getvalue())
@ -969,7 +970,7 @@ class ContextFormatterTestCase(LogTestBase):
message = 'test' message = 'test'
self.log.info(message, context=ctxt) self.log.info(message, context=ctxt)
expected = ("HAS CONTEXT [%s %s %s]: %s\n" % expected = ("HAS CONTEXT [%s %s %s]: %s\n" %
(ctxt.request_id, ctxt.user, ctxt.project_id, (ctxt.request_id, ctxt.user_id, ctxt.project_id,
str(message))) str(message)))
self.assertEqual(expected, self.stream.getvalue()) self.assertEqual(expected, self.stream.getvalue())
@ -1275,9 +1276,9 @@ class DomainTestCase(LogTestBase):
ctxt = _fake_context() ctxt = _fake_context()
user_identity = (self.CONF.logging_user_identity_format % user_identity = (self.CONF.logging_user_identity_format %
ctxt.get_logging_values()) ctxt.get_logging_values())
self.assertIn(ctxt.domain, user_identity) self.assertIn(ctxt.domain_id, user_identity)
self.assertIn(ctxt.project_domain, user_identity) self.assertIn(ctxt.project_domain_id, user_identity)
self.assertIn(ctxt.user_domain, user_identity) self.assertIn(ctxt.user_domain_id, user_identity)
self._validate_keys(ctxt, ('[%s]: %s' % self._validate_keys(ctxt, ('[%s]: %s' %
(ctxt.request_id, user_identity))) (ctxt.request_id, user_identity)))