Skip to content

Add support for reporting skipped tests #15

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for reporting skipped tests #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 33 additions & 9 deletions HTMLTestRunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""

from __future__ import print_function, absolute_import
# URL: http://tungwaiyip.info/software/HTMLTestRunner.html

__author__ = "Wai Yip Tung"
Expand Down Expand Up @@ -186,6 +186,7 @@ class Template_mixin(object):
0: 'pass',
1: 'fail',
2: 'error',
3: 'skip',
}

DEFAULT_TITLE = 'Unit Test Report'
Expand Down Expand Up @@ -385,9 +386,11 @@ class Template_mixin(object):
}
#total_row { font-weight: bold; }
.passClass { background-color: #6c6; }
.skipClass { background-color: yellow; }
.failClass { background-color: #c60; }
.errorClass { background-color: #c00; }
.passCase { color: #6c6; }
.skipCase { color: #c60; font-weight: bold; }
.failCase { color: #c60; font-weight: bold; }
.errorCase { color: #c00; font-weight: bold; }
.hiddenRow { display: none; }
Expand Down Expand Up @@ -443,6 +446,7 @@ class Template_mixin(object):
<td>Test Group/Test case</td>
<td>Count</td>
<td>Pass</td>
<td>Skip</td>
<td>Fail</td>
<td>Error</td>
<td>View</td>
Expand All @@ -452,6 +456,7 @@ class Template_mixin(object):
<td>Total</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td>&nbsp;</td>
Expand All @@ -464,6 +469,7 @@ class Template_mixin(object):
<td>%(desc)s</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td><a href="javascript:showClassDetail('%(cid)s',%(count)s)">Detail</a></td>
Expand All @@ -474,7 +480,7 @@ class Template_mixin(object):
REPORT_TEST_WITH_OUTPUT_TMPL = r"""
<tr id='%(tid)s' class='%(Class)s'>
<td class='%(style)s'><div class='testcase'>%(desc)s</div></td>
<td colspan='5' align='center'>
<td colspan='6' align='center'>

<!--css div popup start-->
<a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_%(tid)s')" >
Expand All @@ -499,7 +505,7 @@ class Template_mixin(object):
REPORT_TEST_NO_OUTPUT_TMPL = r"""
<tr id='%(tid)s' class='%(Class)s'>
<td class='%(style)s'><div class='testcase'>%(desc)s</div></td>
<td colspan='5' align='center'>%(status)s</td>
<td colspan='6' align='center'>%(status)s</td>
</tr>
""" # variables: (tid, Class, style, desc, status)

Expand Down Expand Up @@ -533,6 +539,7 @@ def __init__(self, verbosity=1):
self.success_count = 0
self.failure_count = 0
self.error_count = 0
self.skip_count = 0
self.verbosity = verbosity

# result is a list of result in 4 tuple
Expand Down Expand Up @@ -614,6 +621,19 @@ def addFailure(self, test, err):
else:
sys.stderr.write('F')

def addSkip(self, test, err):
self.skip_count += 1
TestResult.addSkip(self, test, err)
_, _exc_str = self.skipped[-1]
output = self.complete_output()
self.result.append((3, test, output, _exc_str))
if self.verbosity > 1:
sys.stderr.write('S ')
sys.stderr.write(str(test))
sys.stderr.write('\n')
else:
sys.stderr.write('S')


class HTMLTestRunner(Template_mixin):
"""
Expand All @@ -639,7 +659,7 @@ def run(self, test):
test(result)
self.stopTime = datetime.datetime.now()
self.generateReport(test, result)
print >>sys.stderr, '\nTime Elapsed: %s' % (self.stopTime-self.startTime)
print('\nTime Elapsed: %s' % (self.stopTime-self.startTime), file=sys.stderr)
return result


Expand Down Expand Up @@ -667,6 +687,7 @@ def getReportAttributes(self, result):
duration = str(self.stopTime - self.startTime)
status = []
if result.success_count: status.append('Pass %s' % result.success_count)
if result.skip_count: status.append('Skip %s' % result.skip_count )
if result.failure_count: status.append('Failure %s' % result.failure_count)
if result.error_count: status.append('Error %s' % result.error_count )
if status:
Expand Down Expand Up @@ -723,11 +744,12 @@ def _generate_report(self, result):
sortedResult = self.sortResult(result.result)
for cid, (cls, cls_results) in enumerate(sortedResult):
# subtotal for a class
np = nf = ne = 0
np = ns = nf = ne = 0
for n,t,o,e in cls_results:
if n == 0: np += 1
elif n == 1: nf += 1
else: ne += 1
elif n == 2: ne += 1
elif n == 3: ns += 1

# format class description
if cls.__module__ == "__main__":
Expand All @@ -738,10 +760,11 @@ def _generate_report(self, result):
desc = doc and '%s: %s' % (name, doc) or name

row = self.REPORT_CLASS_TMPL % dict(
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns and 'skipClass' or 'passClass',
desc = desc,
count = np+nf+ne,
count = np+ns+nf+ne,
Pass = np,
skip = ns,
fail = nf,
error = ne,
cid = 'c%s' % (cid+1),
Expand All @@ -753,8 +776,9 @@ def _generate_report(self, result):

report = self.REPORT_TMPL % dict(
test_list = ''.join(rows),
count = str(result.success_count+result.failure_count+result.error_count),
count = str(result.success_count+result.failure_count+result.error_count+result.skip_count),
Pass = str(result.success_count),
skip = str(result.skip_count),
fail = str(result.failure_count),
error = str(result.error_count),
)
Expand Down