Skip to content

Commit

Permalink
Fixed #26 -- Added pytest 6 compatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
freakboy3742 committed Aug 8, 2020
1 parent a482053 commit b3efa1f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
1 change: 1 addition & 0 deletions changes/26.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Corrected a problem with output of skipped tests exposed by pytest 6.
21 changes: 12 additions & 9 deletions pytest_tldr.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def pytest_collectreport(self, report):
self.print("=" * 78)
self.print("CRITICAL: {}".format(report.nodeid))
self.print("-" * 78)
self.print(report.longrepr)
self.print(report.longreprtext)

def pytest_sessionstart(self, session):
self._starttime = time.time()
Expand Down Expand Up @@ -219,6 +219,7 @@ def report_error(self, report):
def report_skip(self, report):
self.stats.setdefault('s', []).append(report)
if self.verbosity:
# breakpoint()
self.print(report.longrepr[2])
else:
self.print('s', end='', flush=True)
Expand All @@ -244,28 +245,29 @@ def pytest_runtest_logreport(self, report):

self._n_tests += 1
if report.failed:
if report.longrepr == 'Unexpected success':
if report.longreprtext == 'Unexpected success':
# pytest raw xfail
# unittest @unexpectedSuccess, Python 3
self.report_unexpected_success(report)
else:
if '\nAssertionError: ' in str(report.longrepr) \
or '\nFailed: ' in str(report.longrepr):
if '\nAssertionError: ' in str(report.longreprtext) \
or '\nFailed: ' in str(report.longreprtext):
# pytest assertion
# unittest self.assert()
self.report_fail(report)
elif str(report.longrepr).startswith('[XPASS('):
elif str(report.longreprtext).startswith('[XPASS('):
# pytest xfail(strict=True)
self.report_unexpected_success(report)
else:
self.report_error(report)
elif report.skipped:
# breakpoint()
if isinstance(report.longrepr, tuple):
self.report_skip(report)
else:
self.report_expected_failure(report)
else:
if report.longrepr == 'Unexpected success':
if report.longreprtext == 'Unexpected success':
# unittest @unexpectedSuccess, Py2.7
self.report_unexpected_success(report)
else:
Expand All @@ -274,6 +276,7 @@ def pytest_runtest_logreport(self, report):
if report.failed:
self.report_error(report)
elif report.skipped:
# breakpoint()
if isinstance(report.longrepr, tuple):
self.report_skip(report)
else:
Expand All @@ -290,7 +293,7 @@ def pytest_sessionfinish(self, exitstatus):
self.print("-" * 78)
if report.capstdout:
self.print(report.capstdout)
self.print(report.longrepr)
self.print(report.longreprtext)
self.print()

failures = self.stats.get('F', [])
Expand All @@ -300,7 +303,7 @@ def pytest_sessionfinish(self, exitstatus):
self.print("-" * 78)
if report.capstdout:
self.print(report.capstdout)
self.print(report.longrepr)
self.print(report.longreprtext)
self.print()

if self.verbosity >= 3:
Expand All @@ -318,7 +321,7 @@ def pytest_sessionfinish(self, exitstatus):
self.print("UNEXPECTED SUCCESS: {}".format(report.nodeid))
if report.capstdout:
self.print(report.capstdout)
self.print(report.longrepr)
self.print(report.longreprtext)
self.print()

self.print("-" * 78)
Expand Down

0 comments on commit b3efa1f

Please sign in to comment.