Skip to content

Commit db3ed4f

Browse files
authored
feat: add test name in test_string (#517)
* feat: Add test name in test_string pytest.expect files containing requirement tests needs update
1 parent 71f5ba3 commit db3ed4f

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

pytest_splunk_addon/standard_lib/requirement_tests/test_generator.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ def generate_cim_req_params(self):
129129
for event_tag in root.iter("event"):
130130
event_no += 1
131131
unescaped_event = self.get_event(event_tag)
132+
event_name = self.get_event_name(event_tag)
132133
transport_type = self.extract_transport_tag(event_tag)
133134
if transport_type.lower() == "syslog":
134135
stripped_event = self.strip_syslog_header(unescaped_event)
@@ -200,9 +201,16 @@ def generate_cim_req_params(self):
200201
"transport_type": transport_type,
201202
"exceptions_dict": exceptions_dict,
202203
},
203-
id=f"{(' '.join(model_list))}::{filename}::event_no::{event_no}",
204+
id=f"{(' '.join(model_list))}::{filename}::event_no::{event_no}::event_name::{event_name}",
204205
)
205206

207+
def get_event_name(self, event_tag):
208+
"""
209+
Input: Event tag
210+
Function to return event name
211+
"""
212+
return event_tag.get("name")
213+
206214
def get_models(self, root):
207215
"""
208216
Input: Root of the xml file

tests/unit/tests_standard_lib/test_requirement_tests/test_test_generator.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ def test_extract_params():
9999
"extract_transport_tag_return_value, "
100100
"root_events, "
101101
"get_models_return_value, "
102+
"get_event_name_return_value, "
102103
"extract_key_value_xml_return_value, "
103104
"expected_output",
104105
[
@@ -108,6 +109,7 @@ def test_extract_params():
108109
["syslog"],
109110
{"event": ["<34>Oct 11 22:14:15 machine1 pr1:event_1"]},
110111
[["model_1:dataset_1", "model_2:dataset_2"]],
112+
["event_name_1"],
111113
[{"field1": "value1", "field2": "value2"}, {"field3": "value3"}],
112114
[
113115
(
@@ -123,7 +125,7 @@ def test_extract_params():
123125
"transport_type": "syslog",
124126
},
125127
"model_1:dataset_1 "
126-
"model_2:dataset_2::fake_path/requirement.log::event_no::1",
128+
"model_2:dataset_2::fake_path/requirement.log::event_no::1::event_name::event_name_1",
127129
),
128130
],
129131
),
@@ -133,6 +135,7 @@ def test_extract_params():
133135
["syslog"],
134136
{"event": ["event_1", "event_2"]},
135137
[["model_1:dataset_1", "model_2:dataset_2"], ["model_3:dataset_3"]],
138+
["event_name_2"],
136139
[{"field1": "value1", "field2": "value2"}, {"field3": "value3"}],
137140
[],
138141
),
@@ -142,6 +145,7 @@ def test_extract_params():
142145
["syslog"],
143146
{"event": ["event_1"]},
144147
[[]],
148+
["event_name_3"],
145149
[{"field1": "value1", "field2": "value2"}, {"field3": "value3"}],
146150
[],
147151
),
@@ -155,6 +159,7 @@ def test_generate_cim_req_params(
155159
extract_transport_tag_return_value,
156160
root_events,
157161
get_models_return_value,
162+
get_event_name_return_value,
158163
extract_key_value_xml_return_value,
159164
expected_output,
160165
):
@@ -177,6 +182,8 @@ def test_generate_cim_req_params(
177182
ReqsTestGenerator, "escape_char_event", side_effect=lambda x: x
178183
), patch.object(
179184
ReqsTestGenerator, "get_models", side_effect=get_models_return_value
185+
), patch.object(
186+
ReqsTestGenerator, "get_event_name", side_effect=get_event_name_return_value
180187
), patch.object(
181188
ReqsTestGenerator,
182189
"extract_key_value_xml",

0 commit comments

Comments
 (0)