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

Use errors attribute for problems when testing code (take II) #253

Merged
merged 2 commits into from
May 29, 2020
Merged

Use errors attribute for problems when testing code (take II) #253

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1d0eae
Use DEPRECATION instead of WARNING for package deprecation messages
j-rivero Apr 27, 2020
e6276ef
Error message needs to be inside its own XML tag according to XSD
j-rivero May 27, 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
15 changes: 9 additions & 6 deletions ament_cmake_test/ament_cmake_test/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def main(argv=sys.argv[1:]):
# in case the command segfaults or timeouts and does not generate one
failure_result_file = _generate_result(
args.result_file,
failure_message='The test did not generate a result file.')
error_message='The test did not generate a result file.')
with open(args.result_file, 'w') as h:
h.write(failure_result_file)

Expand Down Expand Up @@ -237,7 +237,7 @@ def log(msg, **kwargs):
# regenerate result file to include output / exception of the invoked command
failure_result_file = _generate_result(
args.result_file,
failure_message='The test did not generate a result file:\n\n' + output)
error_message='The test did not generate a result file:\n\n' + output)
with open(args.result_file, 'w') as h:
h.write(failure_result_file)
else:
Expand Down Expand Up @@ -293,28 +293,31 @@ def log(msg, **kwargs):
return rc


def _generate_result(result_file, *, failure_message=None, skip=False):
def _generate_result(result_file, *, failure_message=None, skip=False, error_message=None):
# the generated result file must be readable
# by any of the Jenkins test result report publishers
pkgname = os.path.basename(os.path.dirname(result_file))
testname = os.path.splitext(os.path.basename(result_file))[0]
error_message = '<error message=%s/>' % quoteattr(error_message) \
if error_message else ''
failure_message = '<failure message=%s/>' % quoteattr(failure_message) \
if failure_message else ''
skipped_message = \
'<skipped type="skip" message="">![CDATA[Test Skipped by developer]]</skipped>' \
if skip else ''
return """<?xml version="1.0" encoding="UTF-8"?>
<testsuite name="%s" tests="1" failures="%d" time="0" errors="0" skipped="%d">
<testsuite name="%s" tests="1" failures="%d" time="0" errors="%d" skipped="%d">
<testcase classname="%s" name="%s.missing_result" time="0">
%s%s
%s%s%s
j-rivero marked this conversation as resolved.
Show resolved Hide resolved
</testcase>
</testsuite>\n""" % \
(
pkgname,
1 if failure_message else 0,
1 if error_message else 0,
1 if skip else 0,
pkgname, testname,
failure_message, skipped_message
failure_message, skipped_message, error_message
)


Expand Down