Skip to content

Commit 3a89b6b

Browse files
committed
fix: data model mismatch error message
1 parent 025f741 commit 3a89b6b

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

pytest_splunk_addon/standard_lib/requirement_tests/test_templates.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def datamodel_check_test(self, keyValue_dict_SPL, requrement_file_model_list):
106106
lis_extra_extracted_splunkside,
107107
list_extra_datamodel_requirement_file,
108108
) = self.compare_datamodel(requrement_file_model_list, datamodel_based_on_tag)
109-
return list_extra_datamodel_requirement_file, lis_extra_extracted_splunkside
109+
return list_extra_datamodel_requirement_file, lis_extra_extracted_splunkside, datamodel_based_on_tag
110110

111111
def remove_empty_keys(self, event):
112112
event = re.sub(
@@ -160,21 +160,18 @@ def test_requirement_params(
160160
(
161161
list_unmatched_datamodel_splunkside,
162162
list_unmatched_datamodel_requirement_file,
163+
datamodel_based_on_tag,
163164
) = self.datamodel_check_test(keyValue_dict_SPL, model_datalist)
164165
datamodel_check = not bool(
165166
list_unmatched_datamodel_splunkside
166167
or list_unmatched_datamodel_requirement_file
167168
)
168169
self.logger.info(f"Data model check: {datamodel_check}")
169-
if not list_unmatched_datamodel_requirement_file:
170-
list_unmatched_datamodel_requirement_file = "None"
171-
if not list_unmatched_datamodel_splunkside:
172-
list_unmatched_datamodel_splunkside = "None"
173170
sourcetype = keyValue_dict_SPL["_sourcetype"]
174171
assert datamodel_check, (
175172
f"data model check: {datamodel_check} \n"
176-
f"data model in requirement file {list_unmatched_datamodel_splunkside}\n "
177-
f"data model extracted by TA {list_unmatched_datamodel_requirement_file}\n"
173+
f"data model in requirement file {model_datalist}\n "
174+
f"data model extracted by TA {list(datamodel_based_on_tag.keys())}\n"
178175
f"sourcetype of ingested event: {sourcetype} \n"
179176
)
180177
field_extraction_check, missing_key_value = self.compare(

0 commit comments

Comments
 (0)