Skip to content

Commit fc92f9f

Browse files
Improve a comment
1 parent 0b725e7 commit fc92f9f

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/_pytest/python.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
from _pytest.deprecated import check_ispytest
5959
from _pytest.deprecated import INSTANCE_COLLECTOR
6060
from _pytest.deprecated import NOSE_SUPPORT_METHOD
61+
from _pytest.fixtures import _get_direct_parametrize_args
6162
from _pytest.fixtures import FixtureDef
6263
from _pytest.fixtures import FixtureRequest
63-
from _pytest.fixtures import _get_direct_parametrize_args
6464
from _pytest.fixtures import FuncFixtureInfo
6565
from _pytest.fixtures import get_scope_node
6666
from _pytest.main import Session
@@ -503,13 +503,15 @@ def _genfunctions(self, name: str, funcobj) -> Iterator["Function"]:
503503
if not metafunc._calls:
504504
yield Function.from_parent(self, name=name, fixtureinfo=fixtureinfo)
505505
else:
506-
507506
if hasattr(metafunc, "has_dynamic_parametrize"):
508-
# add_funcarg_pseudo_fixture_def may have shadowed some fixtures
509-
# due to dynamic direct parametrization so make sure we update
510-
# what the function really needs. Note that we didn't need to do this if
511-
# only indirect dynamic parametrization had taken place, but anyway we did
512-
# it as differentiating between direct and indirect requires a dirty hack.
507+
# Parametrizations takeing place in module/class-specific `pytest_generate_tests`
508+
# hooks, a.k.a dynamic parametrizations, may have shadowed some fixtures
509+
# so make sure we update what the function really needs.
510+
#
511+
# Note that we didn't need to do this if only indirect dynamic parametrization had
512+
# taken place i.e. with `indirect=True`, but anyway we did it as differentiating
513+
# between direct and indirect requires a dirty hack.
514+
fm = self.session._fixturemanager
513515
fixture_closure, _ = fm.getfixtureclosure(
514516
definition,
515517
fixtureinfo.initialnames,

0 commit comments

Comments
 (0)