Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ Roberto Polli
Roland Puntaier
Romain Dorgueil
Roman Bolshakov
rokkalababu-dotcom
Ronny Pfannschmidt
Roqia Salah
Ross Lawley
Expand Down
1 change: 1 addition & 0 deletions changelog/15406.improvement.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Avoid quadratic report scanning when displaying captured teardown output in passed, xpassed, and failed test summaries.
29 changes: 16 additions & 13 deletions src/_pytest/terminal.py
Original file line number Diff line number Diff line change
Expand Up @@ -1186,23 +1186,25 @@ def summary_passes_combined(
if not reports:
return
self.write_sep("=", sep_title)
teardown_reports = self._get_teardown_reports()
for rep in reports:
if rep.sections:
msg = self._getfailureheadline(rep)
self.write_sep("_", msg, green=True, bold=True)
self._outrep_summary(rep)
self._handle_teardown_sections(rep.id)

def _get_teardown_reports(self, node_id: NodeId) -> list[TestReport]:
reports = self.getreports("")
return [
report
for report in reports
if report.when == "teardown" and report.id == node_id
]

def _handle_teardown_sections(self, node_id: NodeId) -> None:
for report in self._get_teardown_reports(node_id):
self._handle_teardown_sections(rep.id, teardown_reports)

def _get_teardown_reports(self) -> dict[NodeId, list[TestReport]]:
reports: dict[NodeId, list[TestReport]] = {}
for report in self.getreports(""):
if report.when == "teardown":
reports.setdefault(report.id, []).append(report)
return reports

def _handle_teardown_sections(
self, node_id: NodeId, reports: Mapping[NodeId, list[TestReport]]
) -> None:
for report in reports.get(node_id, ()):
self.print_teardown_sections(report)

def print_teardown_sections(self, rep: TestReport) -> None:
Expand Down Expand Up @@ -1247,11 +1249,12 @@ def summary_failures_combined(
self._outrep_summary(rep)
self.write_line(line)
else:
teardown_reports = self._get_teardown_reports()
for rep in reports:
msg = self._getfailureheadline(rep)
self.write_sep("_", msg, red=True, bold=True)
self._outrep_summary(rep)
self._handle_teardown_sections(rep.id)
self._handle_teardown_sections(rep.id, teardown_reports)

def summary_errors(self) -> None:
if self.config.option.tbstyle != "no":
Expand Down
58 changes: 58 additions & 0 deletions testing/test_terminal.py
Original file line number Diff line number Diff line change
Expand Up @@ -1469,6 +1469,64 @@ def test_pass_no_output():
)


@pytest.mark.parametrize(
("report_chars", "outcome", "mark", "statement"),
[
("P", "passed", "", "pass"),
("X", "xpassed", "@pytest.mark.xfail(strict=False)", "pass"),
("f", "failed", "", "assert False"),
],
)
def test_teardown_output_summary_scans_reports_linearly(
pytester: Pytester, report_chars: str, outcome: str, mark: str, statement: str
) -> None:
pytester.makeconftest(
"""
from pathlib import Path
import pytest

class CountingReports(list):
visits = 0

def __iter__(self):
for report in super().__iter__():
self.visits += 1
yield report

@pytest.hookimpl(wrapper=True, tryfirst=True)
def pytest_terminal_summary(terminalreporter):
reports = CountingReports(terminalreporter.stats.get("", ()))
terminalreporter.stats[""] = reports
yield
Path("report-visits.txt").write_text(f"{reports.visits} {len(reports)}")
"""
)
pytester.makepyfile(
f"""
import pytest

@pytest.fixture(autouse=True)
def teardown_output(request):
yield
print(f"teardown-{{request.node.callspec.params['number']}}")

@pytest.mark.parametrize("number", range(30))
{mark}
def test_case(number):
{statement}
"""
)
result = pytester.runpytest(f"-r{report_chars}")
result.assert_outcomes(**{outcome: 30})
lines = result.stdout.lines
for number in range(30):
assert lines.count(f"teardown-{number}") == 1
visits, count = map(int, (pytester.path / "report-visits.txt").read_text().split())
# Count work instead of timing it: each report should be visited a bounded
# number of times, rather than once for every test whose output is shown.
assert visits <= 10 * count


def test_color_yes(pytester: Pytester, color_mapping) -> None:
p1 = pytester.makepyfile(
"""
Expand Down
Loading