|
rdobuilder |
09630d |
From f939f827a113d9b842486a029b08c85c0f09792a Mon Sep 17 00:00:00 2001
|
|
rdobuilder |
09630d |
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
|
|
rdobuilder |
09630d |
Date: Tue, 4 Jul 2023 09:20:35 +0200
|
|
rdobuilder |
09630d |
Subject: [PATCH] Adjust tests for taskName attribute added in Python 3.12
|
|
rdobuilder |
09630d |
|
|
rdobuilder |
09630d |
---
|
|
rdobuilder |
09630d |
tests/tests.py | 6 +++---
|
|
rdobuilder |
09630d |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
rdobuilder |
09630d |
|
|
rdobuilder |
09630d |
diff --git a/tests/tests.py b/tests/tests.py
|
|
rdobuilder |
09630d |
index 9f433d0..fc907d6 100644
|
|
rdobuilder |
09630d |
--- a/tests/tests.py
|
|
rdobuilder |
09630d |
+++ b/tests/tests.py
|
|
rdobuilder |
09630d |
@@ -45,7 +45,7 @@ class TestJsonLogger(unittest.TestCase):
|
|
rdobuilder |
09630d |
def testPercentageFormat(self):
|
|
rdobuilder |
09630d |
fr = jsonlogger.JsonFormatter(
|
|
rdobuilder |
09630d |
# All kind of different styles to check the regex
|
|
rdobuilder |
09630d |
- '[%(levelname)8s] %(message)s %(filename)s:%(lineno)d %(asctime)'
|
|
rdobuilder |
09630d |
+ '[%(levelname)8s] %(message)s %(filename)s:%(lineno)d %(asctime) %(taskName)'
|
|
rdobuilder |
09630d |
)
|
|
rdobuilder |
09630d |
self.logHandler.setFormatter(fr)
|
|
rdobuilder |
09630d |
|
|
rdobuilder |
09630d |
@@ -54,7 +54,7 @@ class TestJsonLogger(unittest.TestCase):
|
|
rdobuilder |
09630d |
logJson = json.loads(self.buffer.getvalue())
|
|
rdobuilder |
09630d |
|
|
rdobuilder |
09630d |
self.assertEqual(logJson["message"], msg)
|
|
rdobuilder |
09630d |
- self.assertEqual(logJson.keys(), {'levelname', 'message', 'filename', 'lineno', 'asctime'})
|
|
rdobuilder |
09630d |
+ self.assertEqual(logJson.keys(), {'levelname', 'message', 'filename', 'lineno', 'asctime', 'taskName'})
|
|
rdobuilder |
09630d |
|
|
rdobuilder |
09630d |
def testRenameBaseField(self):
|
|
rdobuilder |
09630d |
fr = jsonlogger.JsonFormatter(rename_fields={'message': '@message'})
|
|
rdobuilder |
09630d |
@@ -256,7 +256,7 @@ class TestJsonLogger(unittest.TestCase):
|
|
rdobuilder |
09630d |
|
|
rdobuilder |
09630d |
self.logger.info(" message", extra=value)
|
|
rdobuilder |
09630d |
msg = self.buffer.getvalue()
|
|
rdobuilder |
09630d |
- self.assertEqual(msg, "{\"message\": \" message\", \"special\": [3.0, 8.0]}\n")
|
|
rdobuilder |
09630d |
+ self.assertEqual(msg, "{\"message\": \" message\", \"taskName\": null, \"special\": [3.0, 8.0]}\n")
|
|
rdobuilder |
09630d |
|
|
rdobuilder |
09630d |
if __name__ == '__main__':
|
|
rdobuilder |
09630d |
if len(sys.argv[1:]) > 0:
|
|
rdobuilder |
09630d |
--
|
|
rdobuilder |
09630d |
2.40.1
|
|
rdobuilder |
09630d |
|