Skip to content
Open
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 changelog/15406.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed quadratic slowdown of the ``-rP``/``-rX`` and failure summaries in large test suites, caused by rescanning all teardown reports for every test.
26 changes: 13 additions & 13 deletions src/_pytest/terminal.py
Original file line number Diff line number Diff line change
Expand Up @@ -1186,24 +1186,22 @@ 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)
for report in teardown_reports.get(rep.id, ()):
self.print_teardown_sections(report)

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.print_teardown_sections(report)
def _get_teardown_reports(self) -> dict[NodeId, list[TestReport]]:
"""Passed teardown reports, grouped by node id."""
by_id: dict[NodeId, list[TestReport]] = {}
for report in self.getreports(""):
if report.when == "teardown":
by_id.setdefault(report.id, []).append(report)
return by_id

def print_teardown_sections(self, rep: TestReport) -> None:
showcapture = self.config.option.showcapture
Expand Down Expand Up @@ -1247,11 +1245,13 @@ 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)
for report in teardown_reports.get(rep.id, ()):
self.print_teardown_sections(report)

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


def test_pass_output_reporting_teardown_per_test(pytester: Pytester) -> None:
"""Each test's captured teardown output is shown under that test (#15406)."""
pytester.makepyfile(
"""
import pytest

@pytest.fixture(autouse=True)
def fix(request):
yield
print(f"teardown {request.node.name}")

def test_a():
print("call a")

def test_b():
print("call b")
"""
)
result = pytester.runpytest("-rP")
result.stdout.fnmatch_lines(
[
"*_ test_a _*",
"call a",
"*- Captured stdout teardown -*",
"teardown test_a",
"*_ test_b _*",
"call b",
"*- Captured stdout teardown -*",
"teardown test_b",
],
consecutive=False,
)
assert result.stdout.str().count("teardown test_") == 2


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