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/15047.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed :option:`--fixtures` and :option:`--fixtures-per-test` exiting with status 0 even when collection had errors.
17 changes: 11 additions & 6 deletions src/_pytest/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
from _pytest.deprecated import FIXTUREDEF_HAS_LOCATION_DEPRECATED
from _pytest.deprecated import PARSEFACTORIES_NODEID_DEPRECATED
from _pytest.deprecated import YIELD_FIXTURE
from _pytest.main import _raise_on_collection_errors
from _pytest.main import Session
from _pytest.mark import Mark
from _pytest.mark import ParameterSet
Expand Down Expand Up @@ -1674,11 +1675,9 @@ def pytest_addoption(parser: Parser) -> None:

def pytest_cmdline_main(config: Config) -> int | ExitCode | None:
if config.option.showfixtures:
showfixtures(config)
return 0
return showfixtures(config)
if config.option.show_fixtures_per_test:
show_fixtures_per_test(config)
return 0
return show_fixtures_per_test(config)
return None


Expand Down Expand Up @@ -2447,7 +2446,7 @@ def _get_fixtures_per_test(test: nodes.Item) -> Iterator[FixtureDef[object]]:
yield fixturedef


def _show_fixtures_per_test(config: Config, session: Session) -> None:
def _show_fixtures_per_test(config: Config, session: Session) -> int | ExitCode:
import _pytest.config

session.perform_collect()
Expand Down Expand Up @@ -2495,14 +2494,17 @@ def write_item(item: nodes.Item) -> None:
for session_item in session.items:
write_item(session_item)

_raise_on_collection_errors(session)
return ExitCode.TESTS_FAILED if session.testsfailed else ExitCode.OK


def showfixtures(config: Config) -> int | ExitCode:
from _pytest.main import wrap_session

return wrap_session(config, _showfixtures_main)


def _showfixtures_main(config: Config, session: Session) -> None:
def _showfixtures_main(config: Config, session: Session) -> int | ExitCode:
import _pytest.config

session.perform_collect()
Expand Down Expand Up @@ -2552,6 +2554,9 @@ def _showfixtures_main(config: Config, session: Session) -> None:
tw.line(" no docstring available", red=True)
tw.line()

_raise_on_collection_errors(session)
return ExitCode.TESTS_FAILED if session.testsfailed else ExitCode.OK


def write_docstring(tw: TerminalWriter, doc: str, indent: str = " ") -> None:
for line in doc.split("\n"):
Expand Down
6 changes: 5 additions & 1 deletion src/_pytest/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,12 +397,16 @@ def pytest_collection(session: Session) -> None:
session.perform_collect()


def pytest_runtestloop(session: Session) -> bool:
def _raise_on_collection_errors(session: Session) -> None:
if session.testsfailed and not session.config.option.continue_on_collection_errors:
raise session.Interrupted(
f"{session.testsfailed} error{'s' if session.testsfailed != 1 else ''} during collection"
)


def pytest_runtestloop(session: Session) -> bool:
_raise_on_collection_errors(session)

if session.config.option.collectonly:
return True

Expand Down
28 changes: 28 additions & 0 deletions testing/python/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -3855,6 +3855,34 @@ def test_show_fixtures(self, pytester: Pytester) -> None:
]
)

def test_show_fixtures_collection_error(self, pytester: Pytester) -> None:
pytester.makepyfile(
"""
def test_broken(:
pass
"""
)

result = pytester.runpytest("--fixtures")

assert result.ret == ExitCode.INTERRUPTED
result.stdout.fnmatch_lines(["*Interrupted: 1 error during collection*"])

def test_show_fixtures_continue_on_collection_errors(
self, pytester: Pytester
) -> None:
pytester.makepyfile(
"""
def test_broken(:
pass
"""
)

result = pytester.runpytest("--fixtures", "--continue-on-collection-errors")

assert result.ret == ExitCode.TESTS_FAILED
result.stdout.no_fnmatch_line("*Interrupted:*")

def test_show_fixtures_verbose(self, pytester: Pytester) -> None:
result = pytester.runpytest("--fixtures", "-v")
result.stdout.fnmatch_lines(
Expand Down
33 changes: 33 additions & 0 deletions testing/python/show_fixtures_per_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

from _pytest.config import ExitCode
from _pytest.pytester import Pytester


Expand All @@ -9,6 +10,38 @@ def test_should_show_no_output_when_zero_items(pytester: Pytester) -> None:
assert result.ret == 0


def test_fixtures_per_test_collection_error(pytester: Pytester) -> None:
pytester.makepyfile(
"""
def test_broken(:
pass
"""
)

result = pytester.runpytest("--fixtures-per-test")

assert result.ret == ExitCode.INTERRUPTED
result.stdout.fnmatch_lines(["*Interrupted: 1 error during collection*"])


def test_fixtures_per_test_continue_on_collection_errors(
pytester: Pytester,
) -> None:
pytester.makepyfile(
"""
def test_broken(:
pass
"""
)

result = pytester.runpytest(
"--fixtures-per-test", "--continue-on-collection-errors"
)

assert result.ret == ExitCode.TESTS_FAILED
result.stdout.no_fnmatch_line("*Interrupted:*")


def test_fixtures_in_module(pytester: Pytester) -> None:
p = pytester.makepyfile(
'''
Expand Down