Skip to content

Add configurable failure and error types #38

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
sysradium merged 2 commits into from
Nov 1, 2016
Merged

Add configurable failure and error types #38

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
48dc108
Add configurable error type
mareksapota-lyft Oct 22, 2016
d5b2fdb
Add configurable failure type
mareksapota-lyft Oct 22, 2016
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
14 changes: 12 additions & 2 deletions junit_xml/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ def build_xml_doc(self, encoding=None):
attrs = {'type': 'failure'}
if case.failure_message:
attrs['message'] = decode(case.failure_message, encoding)
if case.failure_type:
attrs['type'] = decode(case.failure_type, encoding)
failure_element = ET.Element("failure", attrs)
if case.failure_output:
failure_element.text = decode(case.failure_output, encoding)
Expand All @@ -161,6 +163,8 @@ def build_xml_doc(self, encoding=None):
attrs = {'type': 'error'}
if case.error_message:
attrs['message'] = decode(case.error_message, encoding)
if case.error_type:
attrs['type'] = decode(case.error_type, encoding)
error_element = ET.Element("error", attrs)
if case.error_output:
error_element.text = decode(case.error_output, encoding)
Expand Down Expand Up @@ -280,24 +284,30 @@ def __init__(self, name, classname=None, elapsed_sec=None, stdout=None,
self.classname = classname
self.error_message = None
self.error_output = None
self.error_type = None
self.failure_message = None
self.failure_output = None
self.failure_type = None
self.skipped_message = None
self.skipped_output = None

def add_error_info(self, message=None, output=None):
def add_error_info(self, message=None, output=None, error_type=None):
"""Adds an error message, output, or both to the test case"""
if message:
self.error_message = message
if output:
self.error_output = output
if error_type:
self.error_type = error_type

def add_failure_info(self, message=None, output=None):
def add_failure_info(self, message=None, output=None, failure_type=None):
"""Adds a failure message, output, or both to the test case"""
if message:
self.failure_message = message
if output:
self.failure_output = output
if failure_type:
self.failure_type = failure_type

def add_skipped_info(self, message=None, output=None):
"""Adds a skipped message, output, or both to the test case"""
Expand Down
43 changes: 40 additions & 3 deletions test_junit_xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,27 @@ def test_init_failure_output(self):
self, tcs[0], {'name': 'Failure-Output'},
failure_output="I failed!")

def test_init_failure_type(self):
tc = TestCase('Failure-Type')
tc.add_failure_info(failure_type='com.example.Error')
(ts, tcs) = serialize_and_read(TestSuite('test', [tc]))[0]
verify_test_case(self, tcs[0], {'name': 'Failure-Type'})

tc.add_failure_info("failure message")
(ts, tcs) = serialize_and_read(TestSuite('test', [tc]))[0]
verify_test_case(
self, tcs[0], {'name': 'Failure-Type'},
failure_message="failure message",
failure_type='com.example.Error')

def test_init_failure(self):
tc = TestCase('Failure-Message-and-Output')
tc.add_failure_info("failure message", "I failed!")
(ts, tcs) = serialize_and_read(TestSuite('test', [tc]))[0]
verify_test_case(
self, tcs[0], {'name': 'Failure-Message-and-Output'},
failure_message="failure message", failure_output="I failed!")
failure_message="failure message", failure_output="I failed!",
failure_type='failure')

def test_init_error_message(self):
tc = TestCase('Error-Message')
Expand All @@ -324,13 +338,27 @@ def test_init_error_output(self):
verify_test_case(
self, tcs[0], {'name': 'Error-Output'}, error_output="I errored!")

def test_init_error_type(self):
tc = TestCase('Error-Type')
tc.add_error_info(error_type='com.example.Error')
(ts, tcs) = serialize_and_read(TestSuite('test', [tc]))[0]
verify_test_case(self, tcs[0], {'name': 'Error-Type'})

tc.add_error_info("error message")
(ts, tcs) = serialize_and_read(TestSuite('test', [tc]))[0]
verify_test_case(
self, tcs[0], {'name': 'Error-Type'},
error_message="error message",
error_type='com.example.Error')

def test_init_error(self):
tc = TestCase('Error-Message-and-Output')
tc.add_error_info("error message", "I errored!")
(ts, tcs) = serialize_and_read(TestSuite('test', [tc]))[0]
verify_test_case(
self, tcs[0], {'name': 'Error-Message-and-Output'},
error_message="error message", error_output="I errored!")
error_message="error message", error_output="I errored!",
error_type="error")

def test_init_skipped_message(self):
tc = TestCase('Skipped-Message')
Expand Down Expand Up @@ -421,8 +449,9 @@ def test_init_unicode(self):


def verify_test_case(tc, test_case_element, expected_attributes,
error_message=None, error_output=None,
error_message=None, error_output=None, error_type=None,
failure_message=None, failure_output=None,
failure_type=None,
skipped_message=None, skipped_output=None,
stdout=None, stderr=None):
for k, v in expected_attributes.items():
Expand Down Expand Up @@ -450,6 +479,10 @@ def verify_test_case(tc, test_case_element, expected_attributes,
tc.assertEqual(
error_message, errors[0].attributes['message'].value)

if error_type and errors:
tc.assertEqual(
error_type, errors[0].attributes['type'].value)

if error_output:
tc.assertEqual(
error_output, errors[0].firstChild.nodeValue.strip())
Expand All @@ -464,6 +497,10 @@ def verify_test_case(tc, test_case_element, expected_attributes,
tc.assertEqual(
failure_message, failures[0].attributes['message'].value)

if failure_type and failures:
tc.assertEqual(
failure_type, failures[0].attributes['type'].value)

if failure_output:
tc.assertEqual(
failure_output, failures[0].firstChild.nodeValue.strip())
Expand Down