Skip to content

feat: add test name in test_string #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 25, 2022
Merged

feat: add test name in test_string #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd3774f
feat: Add test name in test_string
nandinivij Jan 20, 2022
f180337
fix: pre-commit failures
nandinivij Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion pytest_splunk_addon/standard_lib/requirement_tests/test_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ def generate_cim_req_params(self):
for event_tag in root.iter("event"):
event_no += 1
unescaped_event = self.get_event(event_tag)
event_name = self.get_event_name(event_tag)
transport_type = self.extract_transport_tag(event_tag)
if transport_type.lower() == "syslog":
stripped_event = self.strip_syslog_header(unescaped_event)
Expand Down Expand Up @@ -200,9 +201,16 @@ def generate_cim_req_params(self):
"transport_type": transport_type,
"exceptions_dict": exceptions_dict,
},
id=f"{(' '.join(model_list))}::{filename}::event_no::{event_no}",
id=f"{(' '.join(model_list))}::{filename}::event_no::{event_no}::event_name::{event_name}",
)

def get_event_name(self, event_tag):
"""
Input: Event tag
Function to return event name
"""
return event_tag.get("name")

def get_models(self, root):
"""
Input: Root of the xml file
Expand Down
9 changes: 8 additions & 1 deletion tests/unit/tests_standard_lib/test_requirement_tests/test_test_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ def test_extract_params():
"extract_transport_tag_return_value, "
"root_events, "
"get_models_return_value, "
"get_event_name_return_value, "
"extract_key_value_xml_return_value, "
"expected_output",
[
Expand All @@ -108,6 +109,7 @@ def test_extract_params():
["syslog"],
{"event": ["<34>Oct 11 22:14:15 machine1 pr1:event_1"]},
[["model_1:dataset_1", "model_2:dataset_2"]],
["event_name_1"],
[{"field1": "value1", "field2": "value2"}, {"field3": "value3"}],
[
(
Expand All @@ -123,7 +125,7 @@ def test_extract_params():
"transport_type": "syslog",
},
"model_1:dataset_1 "
"model_2:dataset_2::fake_path/requirement.log::event_no::1",
"model_2:dataset_2::fake_path/requirement.log::event_no::1::event_name::event_name_1",
),
],
),
Expand All @@ -133,6 +135,7 @@ def test_extract_params():
["syslog"],
{"event": ["event_1", "event_2"]},
[["model_1:dataset_1", "model_2:dataset_2"], ["model_3:dataset_3"]],
["event_name_2"],
[{"field1": "value1", "field2": "value2"}, {"field3": "value3"}],
[],
),
Expand All @@ -142,6 +145,7 @@ def test_extract_params():
["syslog"],
{"event": ["event_1"]},
[[]],
["event_name_3"],
[{"field1": "value1", "field2": "value2"}, {"field3": "value3"}],
[],
),
Expand All @@ -155,6 +159,7 @@ def test_generate_cim_req_params(
extract_transport_tag_return_value,
root_events,
get_models_return_value,
get_event_name_return_value,
extract_key_value_xml_return_value,
expected_output,
):
Expand All @@ -177,6 +182,8 @@ def test_generate_cim_req_params(
ReqsTestGenerator, "escape_char_event", side_effect=lambda x: x
), patch.object(
ReqsTestGenerator, "get_models", side_effect=get_models_return_value
), patch.object(
ReqsTestGenerator, "get_event_name", side_effect=get_event_name_return_value
), patch.object(
ReqsTestGenerator,
"extract_key_value_xml",
Expand Down