Skip to content

Commit 92da998

Browse files
committed
_remove_version_specific_fields unit tests
1 parent 12044d2 commit 92da998

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

tests/test_logzioHandler.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ class TestLogzioHandler(TestCase):
1111
def setUp(self):
1212
self.handler = LogzioHandler('moo')
1313

14+
def _remove_version_specific_fields(self, message):
15+
"""Remove fields that vary by Python version (e.g., taskName added in 3.12)."""
16+
message.pop('taskName', None)
17+
return message
18+
1419
def test_json(self):
1520
formatter = logging.Formatter(
1621
'{ "appname":"%(name)s", "functionName":"%(funcName)s", \"lineNo":"%(lineno)d", "severity":"%('
@@ -30,6 +35,7 @@ def test_json(self):
3035

3136
formatted_message = self.handler.format_message(record)
3237
formatted_message["@timestamp"] = None
38+
self._remove_version_specific_fields(formatted_message)
3339

3440
self.assertDictEqual(
3541
formatted_message,
@@ -44,7 +50,6 @@ def test_json(self):
4450
'message': 'this is a test: moo.',
4551
'path_name': 'handler_test.py',
4652
'severity': 'NOTSET',
47-
'taskName': None,
4853
'type': 'python'
4954
}
5055
)
@@ -63,6 +68,7 @@ def test_string(self):
6368

6469
formatted_message = self.handler.format_message(record)
6570
formatted_message["@timestamp"] = None
71+
self._remove_version_specific_fields(formatted_message)
6672

6773
self.assertDictEqual(
6874
formatted_message,
@@ -73,7 +79,6 @@ def test_string(self):
7379
'logger': 'my-logger',
7480
'message': 'this is a test: moo.',
7581
'path_name': 'handler_test.py',
76-
'taskName': None,
7782
'type': 'python'
7883
}
7984
)
@@ -94,6 +99,7 @@ def test_extra_formatting(self):
9499
record.__dict__["module"] = "testing"
95100
formatted_message = self.handler.format_message(record)
96101
formatted_message["@timestamp"] = None
102+
self._remove_version_specific_fields(formatted_message)
97103

98104
self.assertDictEqual(
99105
formatted_message,
@@ -104,7 +110,6 @@ def test_extra_formatting(self):
104110
'logger': 'my-logger',
105111
'message': 'this is a test: moo.',
106112
'path_name': 'handler_test.py',
107-
'taskName': None,
108113
'type': 'python',
109114
'extra_key': 'extra_value'
110115
}
@@ -124,6 +129,7 @@ def test_format_string_message(self):
124129

125130
formatted_message = self.handler.format_message(record)
126131
formatted_message["@timestamp"] = None
132+
self._remove_version_specific_fields(formatted_message)
127133

128134
self.assertDictEqual(
129135
formatted_message,
@@ -134,7 +140,6 @@ def test_format_string_message(self):
134140
'logger': 'my-logger',
135141
'message': 'this is a test: moo.',
136142
'path_name': 'handler_test.py',
137-
'taskName': None,
138143
'type': 'python'
139144
}
140145
)
@@ -161,6 +166,7 @@ def test_exception(self):
161166

162167
formatted_message = self.handler.format_message(record)
163168
formatted_message["@timestamp"] = None
169+
self._remove_version_specific_fields(formatted_message)
164170

165171
formatted_message["exception"] = formatted_message["exception"].replace(os.path.abspath(__file__), "")
166172
formatted_message["exception"] = re.sub(r", line \d+", "", formatted_message["exception"])
@@ -175,7 +181,6 @@ def test_exception(self):
175181
'message': 'exception test:',
176182
'exception': 'Traceback (most recent call last):\n\n File "", in test_exception\n raise ValueError("oops.")\n\nValueError: oops.\n',
177183
'path_name': 'handler_test.py',
178-
'taskName': None,
179184
'type': 'python',
180185
'tags': ['staging', 'experimental']
181186
},

0 commit comments

Comments
 (0)