Skip to content

Support @pytest.mark.usefixture in fixtures #5783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
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
25 changes: 24 additions & 1 deletion src/_pytest/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,27 @@ def __init__(
self.ids = ids
self._finalizers = []

@property
def argnames(self):
return self._argnames

@argnames.setter
def argnames(self, value):
# TODO: Check who calls this setter
self._argnames = value

@property
def usefixtureargnames(self):
markers = getattr(self.func, "pytestmark", [])
usefixtureargs = tuple(
itertools.chain.from_iterable(
mark.args
for mark in markers
if getattr(mark, "name", None) == "usefixtures"
)
)
return usefixtureargs

def addfinalizer(self, finalizer):
self._finalizers.append(finalizer)

Expand Down Expand Up @@ -906,10 +927,12 @@ def resolve_fixture_function(fixturedef, request):
def pytest_fixture_setup(fixturedef, request):
""" Execution of fixture setup. """
kwargs = {}
for argname in fixturedef.argnames:
for argname in fixturedef.argnames + fixturedef.usefixtureargnames:
fixdef = request._get_active_fixturedef(argname)
result, arg_cache_key, exc = fixdef.cached_result
request._check_scope(argname, request.scope, fixdef.scope)
if argname not in fixturedef.argnames:
continue
kwargs[argname] = result

fixturefunc = resolve_fixture_function(fixturedef, request)
Expand Down
30 changes: 30 additions & 0 deletions testing/test_usefixtures_in_fixtures.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import pytest


@pytest.fixture
def state():
return {}


@pytest.fixture
def setup_for_foo(state):
state["setup"] = True


@pytest.fixture
def foo_explicit(setup_for_foo, state):
return state["setup"] is True


def test_foo_explicit(foo_explicit):
assert foo_explicit


@pytest.fixture
@pytest.mark.usefixtures("setup_for_foo")
def foo_implicit(state):
return state["setup"] is True


def test_foo_implicit(foo_implicit):
assert foo_implicit