Skip to content
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

Jump to bottom

Fix xml writing bug introduced in #16388 #16713

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Fix xml writing bug introduced in #16388 #16713

Show file tree
Hide file tree
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
22 changes: 22 additions & 0 deletions mypy/test/testutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,28 @@ def test_junit_pass(self) -> None:
<testcase classname="mypy" file="mypy" line="1" name="mypy-py3.14-test-plat" time="1.230">
</testcase>
</testsuite>
"""
result = _generate_junit_contents(
dt=1.23,
serious=serious,
messages_by_file=messages_by_file,
version="3.14",
platform="test-plat",
)
assert result == expected

def test_junit_fail_escape_xml_chars(self) -> None:
serious = False
messages_by_file: dict[str | None, list[str]] = {
"file1.py": ["Test failed", "another line < > &"]
}
expected = """<?xml version="1.0" encoding="utf-8"?>
<testsuite errors="0" failures="1" name="mypy" skips="0" tests="1" time="1.230">
<testcase classname="mypy" file="file1.py" line="1" name="mypy-py3.14-test-plat file1.py" time="1.230">
<failure message="mypy produced messages">Test failed
another line &lt; &gt; &amp;</failure>
</testcase>
</testsuite>
"""
result = _generate_junit_contents(
dt=1.23,
Expand Down
6 changes: 4 additions & 2 deletions mypy/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,8 @@ def _generate_junit_contents(
version: str,
platform: str,
) -> str:
from xml.sax.saxutils import escape

if serious:
failures = 0
errors = len(messages_by_file)
Expand All @@ -284,7 +286,7 @@ def _generate_junit_contents(
for filename, messages in messages_by_file.items():
if filename is not None:
xml += JUNIT_TESTCASE_FAIL_TEMPLATE.format(
text="\n".join(messages),
text=escape("\n".join(messages)),
filename=filename,
time=dt,
name="mypy-py{ver}-{platform} {filename}".format(
Expand All @@ -293,7 +295,7 @@ def _generate_junit_contents(
)
else:
xml += JUNIT_TESTCASE_FAIL_TEMPLATE.format(
text="\n".join(messages),
text=escape("\n".join(messages)),
filename="mypy",
time=dt,
name="mypy-py{ver}-{platform}".format(ver=version, platform=platform),
Expand Down