Skip to content

Commit 530be28

Browse files
bluetechnicoddemus
authored andcommitted
fixtures: use early return in _get_active_fixturedef
1 parent d208c1d commit 530be28

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

src/_pytest/fixtures.py

+14-11
Original file line numberDiff line numberDiff line change
@@ -570,18 +570,21 @@ def _get_active_fixturedef(
570570
self, argname: str
571571
) -> Union["FixtureDef[object]", PseudoFixtureDef[object]]:
572572
fixturedef = self._fixture_defs.get(argname)
573-
if fixturedef is None:
574-
try:
575-
fixturedef = self._getnextfixturedef(argname)
576-
except FixtureLookupError:
577-
if argname == "request":
578-
cached_result = (self, [0], None)
579-
return PseudoFixtureDef(cached_result, Scope.Function)
580-
raise
581-
self._compute_fixture_value(fixturedef)
582-
self._fixture_defs[argname] = fixturedef
583-
else:
573+
if fixturedef is not None:
584574
self._check_scope(fixturedef, fixturedef._scope)
575+
return fixturedef
576+
577+
try:
578+
fixturedef = self._getnextfixturedef(argname)
579+
except FixtureLookupError:
580+
if argname == "request":
581+
cached_result = (self, [0], None)
582+
return PseudoFixtureDef(cached_result, Scope.Function)
583+
raise
584+
585+
self._compute_fixture_value(fixturedef)
586+
587+
self._fixture_defs[argname] = fixturedef
585588
return fixturedef
586589

587590
def _get_fixturestack(self) -> List["FixtureDef[Any]"]:

0 commit comments

Comments
 (0)