Skip to content

[reporting] Add option to skip over malformed tr.xml files #2561

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
daall merged 1 commit into from
Nov 20, 2020
Merged

[reporting] Add option to skip over malformed tr.xml files #2561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions test_reporting/junit_xml_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def validate_junit_xml_file(document_name):
return _validate_junit_xml(tree.getroot())


def validate_junit_xml_archive(directory_name):
def validate_junit_xml_archive(directory_name, strict=False):
"""Validate that an XML archive contains valid JUnit XML.

Args:
Expand Down Expand Up @@ -188,10 +188,13 @@ def validate_junit_xml_archive(directory_name):

roots.append(root)
except Exception as e:
raise JUnitXMLValidationError(f"could not parse {document}: {e}") from e
if strict:
raise JUnitXMLValidationError(f"could not parse {document}: {e}") from e

print(f"could not parse {document}: {e} - skipping")

if not roots:
raise JUnitXMLValidationError(f"provided directory {directory_name} does not contain any XML files")
raise JUnitXMLValidationError(f"provided directory {directory_name} does not contain any valid XML files")

return roots

Expand Down Expand Up @@ -448,12 +451,18 @@ def _run_script():
parser.add_argument(
"--directory", "-d", action="store_true", help="Provide a directory instead of a single file."
)
parser.add_argument(
"--strict",
"-s",
action="store_true",
help="Fail validation checks if ANY file in a given directory is not parseable."
)

args = parser.parse_args()

try:
if args.directory:
roots = validate_junit_xml_archive(args.file_name)
roots = validate_junit_xml_archive(args.file_name, args.strict)
else:
roots = [validate_junit_xml_file(args.file_name)]
except JUnitXMLValidationError as e:
Expand Down