chore: ADDON-80802 Resolve minor review comments

Author: spanchal-crest

pytest_splunk_addon/fields_tests/test_templates.py

@@ -186,12 +186,10 @@ def test_requirements_fields(
                 basic_search += f" {param}={param_value}"
 
         if splunk_searchtime_fields_requirements.get("unique_identifier"):
-            record_property(
-                "Event_with", splunk_searchtime_fields_requirements["unique_identifier"]
-            )
             unique_identifier = splunk_searchtime_fields_requirements[
                 "unique_identifier"
             ]
+            record_property("Event_with", unique_identifier)
 
             search = f'search {index_list} {basic_search} unique_identifier="{unique_identifier}" | fields *'
         else:
@@ -420,10 +418,8 @@ def test_datamodels(
         )
 
         if splunk_searchtime_fields_datamodels.get("unique_identifier"):
-            record_property(
-                "Event_with", splunk_searchtime_fields_datamodels["unique_identifier"]
-            )
             unique_identifier = splunk_searchtime_fields_datamodels["unique_identifier"]
+            record_property("Event_with", unique_identifier)
 
             self.logger.info(
                 f'Testing for tag {datamodels} with unique_identifier="{unique_identifier}"'

tests/unit/tests_standard_lib/test_fields_tests/test_test_generator.py

@@ -574,12 +574,8 @@ def test_generate_requirement_tests_with_uuid(mock_uuid4):
     ]
 
     with patch.object(
-        xml_event_parser, "strip_syslog_header", return_value="escaped_event"
-    ), patch.object(
         xml_event_parser, "escape_char_event", return_value="escaped_event"
-    ), patch.object(
-        pytest, "param", side_effect=lambda x, id: (x, id)
-    ) as param_mock:
+    ), patch.object(pytest, "param", side_effect=lambda x, id: (x, id)) as param_mock:
         out = list(
             FieldTestGenerator(
                 "app_path",
@@ -694,12 +690,8 @@ def test_generate_requirement_datamodel_tests_with_uuid(mock_uuid4):
     ]
 
     with patch.object(
-        xml_event_parser, "strip_syslog_header", return_value="escaped_event"
-    ), patch.object(
         xml_event_parser, "escape_char_event", return_value="escaped_event"
-    ), patch.object(
-        pytest, "param", side_effect=lambda x, id: (x, id)
-    ) as param_mock:
+    ), patch.object(pytest, "param", side_effect=lambda x, id: (x, id)) as param_mock:
         out = list(
             FieldTestGenerator(
                 "app_path",