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 ansible-test timeout junit output. #53427

Merged
merged 2 commits into from
Mar 7, 2019
Merged

Fix ansible-test timeout junit output. #53427

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82069b6
Fix ansible-test timeout junit output.
mattclay Mar 7, 2019
8234790
Fix pylint naming issue.
mattclay Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 21 additions & 9 deletions test/runner/lib/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,15 @@ def calculate_confidence(path, line, metadata):

class TestResult(object):
"""Base class for test results."""
def __init__(self, command, test, python_version=None, enable_junit=False):
def __init__(self, command, test, python_version=None):
"""
:type command: str
:type test: str
:type python_version: str
:type enable_junit: bool
"""
self.command = command
self.test = test
self.python_version = python_version
self.enable_junit = enable_junit
self.name = self.test or self.command

if self.python_version:
Expand All @@ -90,7 +88,7 @@ def write(self, args):
if args.lint:
self.write_lint()

if args.junit or self.enable_junit:
if args.junit:
if self.junit:
self.write_junit(args)
else:
Expand Down Expand Up @@ -167,11 +165,11 @@ def __init__(self, timeout_duration):
"""
:type timeout_duration: int
"""
super(TestTimeout, self).__init__(command='timeout', test='', enable_junit=True)
super(TestTimeout, self).__init__(command='timeout', test='')

self.timeout_duration = timeout_duration

def write_junit(self, args):
def write(self, args):
"""
:type args: TestConfig
"""
Expand All @@ -187,10 +185,24 @@ def write_junit(self, args):

output += '\n\nConsult the console log for additional details on where the timeout occurred.'

test_case = self.junit.TestCase(classname=self.command, name=self.name)
test_case.add_error_info(message, output)
timestamp = datetime.datetime.utcnow().replace(microsecond=0).isoformat()

self.save_junit(args, test_case)
# hack to avoid requiring junit-xml, which isn't pre-installed on Shippable outside our test containers
xml = '''
<?xml version="1.0" encoding="utf-8"?>
<testsuites disabled="0" errors="1" failures="0" tests="1" time="0.0">
\t<testsuite disabled="0" errors="1" failures="0" file="None" log="None" name="ansible-test" skipped="0" tests="1" time="0" timestamp="%s" url="None">
\t\t<testcase classname="timeout" name="timeout">
\t\t\t<error message="%s" type="error">%s</error>
\t\t</testcase>
\t</testsuite>
</testsuites>
''' % (timestamp, message, output)

path = self.create_path('junit', '.xml')

with open(path, 'w') as junit_fd:
junit_fd.write(xml)


class TestSuccess(TestResult):
Expand Down