Skip to content

Commit

Permalink
Merge pull request #7574 from nicoddemus/backport-7561
Browse files Browse the repository at this point in the history
[6.0.x] Merge pull request #7561 from nicoddemus/longreprtext-7559
  • Loading branch information
nicoddemus committed Jul 29, 2020
2 parents 3d2c114 + fe25284 commit e876157
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 2 deletions.
1 change: 1 addition & 0 deletions changelog/7559.bugfix.rst
@@ -0,0 +1 @@
Fix regression in plugins using ``TestReport.longreprtext`` (such as ``pytest-html``) when ``TestReport.longrepr`` is not a string.
5 changes: 3 additions & 2 deletions src/_pytest/reports.py
Expand Up @@ -82,9 +82,10 @@ def toterminal(self, out: TerminalWriter) -> None:
longrepr.toterminal(out)
else:
try:
out.line(longrepr)
s = str(longrepr)
except UnicodeEncodeError:
out.line("<unprintable longrepr>")
s = "<unprintable longrepr>"
out.line(s)

def get_sections(self, prefix: str) -> Iterator[Tuple[str, str]]:
for name, content in self.sections:
Expand Down
27 changes: 27 additions & 0 deletions testing/test_runner.py
Expand Up @@ -951,6 +951,33 @@ def test_func():
rep = reports[1]
assert rep.longreprtext == ""

def test_longreprtext_skip(self, testdir) -> None:
"""TestReport.longreprtext can handle non-str ``longrepr`` attributes (#7559)"""
reports = testdir.runitem(
"""
import pytest
def test_func():
pytest.skip()
"""
)
_, call_rep, _ = reports
assert isinstance(call_rep.longrepr, tuple)
assert "Skipped" in call_rep.longreprtext

def test_longreprtext_collect_skip(self, testdir) -> None:
"""CollectReport.longreprtext can handle non-str ``longrepr`` attributes (#7559)"""
testdir.makepyfile(
"""
import pytest
pytest.skip(allow_module_level=True)
"""
)
rec = testdir.inline_run()
calls = rec.getcalls("pytest_collectreport")
_, call = calls
assert isinstance(call.report.longrepr, tuple)
assert "Skipped" in call.report.longreprtext

def test_longreprtext_failure(self, testdir) -> None:
reports = testdir.runitem(
"""
Expand Down

0 comments on commit e876157

Please sign in to comment.