Skip to content

[Eloquent] Backport junit xml fixes for updated xunit plugin on ci.ros2.org #222

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
nuclearsandwich merged 2 commits into from
Mar 26, 2020
Merged

[Eloquent] Backport junit xml fixes for updated xunit plugin on ci.ros2.org #222

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
88a4350
Generate xunit files valid for the junit10.xsd (#220)
j-rivero Mar 11, 2020
ebf5e3b
remove status attribute from result XML (#212)
dirk-thomas Feb 19, 2020
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
4 changes: 2 additions & 2 deletions ament_clang_format/ament_clang_format/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ def get_xunit_content(report, testname, elapsed):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
>
Expand Down Expand Up @@ -347,8 +348,7 @@ def get_xunit_content(report, testname, elapsed):
}
xml += """ <testcase
name=%(quoted_location)s
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_clang_tidy/ament_clang_tidy/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ def get_xunit_content(report, testname, elapsed):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
>
Expand Down Expand Up @@ -290,8 +291,7 @@ def get_xunit_content(report, testname, elapsed):
}
xml += """ <testcase
name=%(quoted_location)s
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_copyright/ament_copyright/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ def get_xunit_content(report, testname, elapsed):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
>
Expand All @@ -448,8 +449,7 @@ def get_xunit_content(report, testname, elapsed):
# if there is a known copyright / license report a single successful test
xml += """ <testcase
name=%(quoted_filename)s
classname="%(testname)s"
status="%(escaped_message)s"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
7 changes: 3 additions & 4 deletions ament_cppcheck/ament_cppcheck/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,10 @@ def get_xunit_content(report, testname, elapsed, skip=None):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
skip="%(skip)d"
skipped="%(skip)d"
>
""" % data

Expand All @@ -263,7 +264,6 @@ def get_xunit_content(report, testname, elapsed, skip=None):
xml += """ <testcase
name=%(quoted_name)s
classname="%(testname)s"
status="notrun"
>
<skipped type="skip" message=%(quoted_message)s>
![CDATA[Test Skipped due to %(skip)s]]
Expand Down Expand Up @@ -297,8 +297,7 @@ def get_xunit_content(report, testname, elapsed, skip=None):
}
xml += """ <testcase
name=%(quoted_location)s
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_cpplint/ament_cpplint/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ def get_xunit_content(report, testname, elapsed):
name="%(testname)s"
tests="%(test_count)d"
failures="%(error_count)d"
errors="0"
time="%(time)s"
>
""" % data
Expand Down Expand Up @@ -314,8 +315,7 @@ def get_xunit_content(report, testname, elapsed):
}
xml += """ <testcase
name=%(quoted_location)s
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_flake8/ament_flake8/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ def get_xunit_content(report, testname, elapsed):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
>
Expand Down Expand Up @@ -228,8 +229,7 @@ def get_xunit_content(report, testname, elapsed):
}
xml += """ <testcase
name="flake8"
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_lint_cmake/ament_lint_cmake/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ def get_xunit_content(report, testname, elapsed):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
>
Expand Down Expand Up @@ -192,8 +193,7 @@ def get_xunit_content(report, testname, elapsed):
}
xml += """ <testcase
name=%(quoted_location)s
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_mypy/ament_mypy/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ def _get_xunit_content(errors: List[Match],
<testsuite
name="{test_name:s}"
tests="{test_count:d}"
errors="0"
failures="{error_count:d}"
time="{time:s}"
>
Expand Down Expand Up @@ -197,8 +198,7 @@ def _get_xunit_content(errors: List[Match],
xml += _dedent_to("""\
<testcase
name="mypy"
classname="{}"
status="No problems found"/>
classname="{}"/>
""", ' ').format(testname)

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_pclint/ament_pclint/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ def get_xunit_content(report, testname, elapsed):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
>
Expand Down Expand Up @@ -358,8 +359,7 @@ def get_xunit_content(report, testname, elapsed):
}
xml += """ <testcase
name=%(quoted_location)s
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_pep257/ament_pep257/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ def get_xunit_content(report, testname, elapsed):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
>
Expand Down Expand Up @@ -226,8 +227,7 @@ def get_xunit_content(report, testname, elapsed):
}
xml += """ <testcase
name=%(quoted_location)s
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_pep8/ament_pep8/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ def get_xunit_content(report, testname):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
>
Expand Down Expand Up @@ -162,8 +163,7 @@ def get_xunit_content(report, testname):
}
xml += """ <testcase
name="pep8"
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_pyflakes/ament_pyflakes/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ def get_xunit_content(report, testname, elapsed):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
>
Expand Down Expand Up @@ -178,8 +179,7 @@ def get_xunit_content(report, testname, elapsed):
}
xml += """ <testcase
name=%(quoted_location)s
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_uncrustify/ament_uncrustify/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ def get_xunit_content(report, testname, elapsed):
name="%(testname)s"
tests="%(test_count)d"
failures="%(error_count)d"
errors="0"
time="%(time)s"
>
""" % data
Expand Down Expand Up @@ -355,8 +356,7 @@ def get_xunit_content(report, testname, elapsed):
}
xml += """ <testcase
name=%(quoted_location)s
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down
4 changes: 2 additions & 2 deletions ament_xmllint/ament_xmllint/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ def get_xunit_content(report, testname, elapsed):
<testsuite
name="%(testname)s"
tests="%(test_count)d"
errors="0"
failures="%(error_count)d"
time="%(time)s"
>
Expand Down Expand Up @@ -251,8 +252,7 @@ def get_xunit_content(report, testname, elapsed):
}
xml += """ <testcase
name=%(quoted_location)s
classname="%(testname)s"
status="No problems found"/>
classname="%(testname)s"/>
""" % data

# output list of checked files
Expand Down