openstack
/
deb-python-steadymark
Code Issues Proposed changes

fixing exception reporting

This commit is contained in:
Gabriel Falcão 2015-12-14 01:37:16 -02:00
parent e5c5edfc0d
commit f9b18bed69
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
steadymark/core.py
View File

@ -47,6 +47,8 @@ from steadymark.six import text_type
class SteadyMarkDoctestRunner(DebugRunner):
def report_unexpected_exception(self, out, test, example, exc_info):
exc_type, exc_val, tb = exc_info
exc_val.example = example
if exc_type is DocTestFailure:
raise exc_info
raise exc_val

21
steadymark/runner.py
View File

@ -46,6 +46,14 @@ if not PY3:
sys.stdout = codecs.getwriter('utf8')(sys.stdout)
def extract_example(exc, attribute_name):
example = getattr(exc, 'example', None)
if not example:
return
return getattr(exc, attribute_name, None)
class Runner(object):
def __init__(self, filename=None, text=u''):
if filename and not os.path.exists(filename):
@ -139,16 +147,17 @@ class Runner(object):
if exc_type is DocTestFailure:
formatted_tb = u"the line {0}: {1}\n".format(
exc_val.example.lineno,
exc_val.example.source,
extract_example(exc_val, 'lineno'),
extract_example(exc_val, 'source'),
)
if exc_val.example.exc_msg:
if extract_example(exc_val, 'exc_msg'):
formatted_tb += "{0}\n".format(
exc_val.example.exc_msg)
extract_example(exc_val, 'exc_msg')
)
else:
formatted_tb += ("resulted in:\n{0}\n"
"when expecting:\n{1}\n".format(
exc_val.got, exc_val.example.want))
exc_val.got, extract_example(exc_val, 'want')))
else:
formatted_tb = self.format_traceback(test, failure)
@ -162,7 +171,7 @@ class Runner(object):
self.print_white("*" * header_length)
for number, line in enumerate(test.raw_code.splitlines(), start=1):
if line == exc_val.example.lineno:
if line == extract_example(exc_val, 'lineno'):
self.print_red("{0}: {1}".format(number, line), indentation=2)
else:
self.print_yellow("{0}: {1}".format(number, line), indentation=2)