Skip to content
This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Commit a27f9d2

Browse files
committed
Adjust tests for taskName attribute added in Python 3.12
gh-91513: Added taskName attribute to logging module for use with asyncio tasks. python/cpython#91513
1 parent 5f85723 commit a27f9d2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tests/test_jsonlogger.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def test_percentage_format(self):
5050
log_json = json.loads(self.buffer.getvalue())
5151

5252
self.assertEqual(log_json["message"], msg)
53-
self.assertEqual(log_json.keys(), {'levelname', 'message', 'filename', 'lineno', 'asctime'})
53+
self.assertEqual(log_json.keys(), {'levelname', 'message', 'filename', 'lineno', 'asctime', 'taskName'})
5454

5555
def test_rename_base_field(self):
5656
fr = jsonlogger.JsonFormatter(rename_fields={'message': '@message'})
@@ -274,7 +274,7 @@ def encode_complex(z):
274274

275275
self.log.info(" message", extra=value)
276276
msg = self.buffer.getvalue()
277-
self.assertEqual(msg, "{\"message\": \" message\", \"special\": [3.0, 8.0]}\n")
277+
self.assertEqual(msg, "{\"message\": \" message\", \"taskName\": null, \"special\": [3.0, 8.0]}\n")
278278

279279
def test_rename_reserved_attrs(self):
280280
log_format = lambda x: ['%({0:s})s'.format(i) for i in x]
@@ -296,7 +296,7 @@ def test_rename_reserved_attrs(self):
296296
self.log.info("message")
297297

298298
msg = self.buffer.getvalue()
299-
self.assertEqual(msg, '{"error.type": null, "error.message": null, "log.origin.function": "test_rename_reserved_attrs", "log.level": "INFO", "log.origin.file.name": "test_jsonlogger", "process.name": "MainProcess", "process.thread.name": "MainThread", "log.message": "message"}\n')
299+
self.assertEqual(msg, '{"taskName": null, "error.type": null, "error.message": null, "log.origin.function": "test_rename_reserved_attrs", "log.level": "INFO", "log.origin.file.name": "test_jsonlogger", "process.name": "MainProcess", "process.thread.name": "MainThread", "log.message": "message"}\n')
300300

301301
def test_merge_record_extra(self):
302302
record = logging.LogRecord("name", level=1, pathname="", lineno=1, msg="Some message", args=None, exc_info=None)

0 commit comments

Comments
 (0)