floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixtures: inline `_compute_fixture_value`

This commit is contained in:
Ran Benita 2024-03-14 20:29:33 +02:00 committed by Bruno Oliveira
parent 530be28575
commit d217d68cde
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/_pytest/fixtures.py
View File

@ -582,26 +582,7 @@ class FixtureRequest(abc.ABC):
return PseudoFixtureDef(cached_result, Scope.Function) return PseudoFixtureDef(cached_result, Scope.Function)
raise raise
self._compute_fixture_value(fixturedef) # Prepare a SubRequest object for calling the fixture.
self._fixture_defs[argname] = fixturedef
return fixturedef
def _get_fixturestack(self) -> List["FixtureDef[Any]"]:
values = [request._fixturedef for request in self._iter_chain()]
values.reverse()
return values
def _compute_fixture_value(self, fixturedef: "FixtureDef[object]") -> None:
"""Create a SubRequest based on "self" and call the execute method
of the given FixtureDef object.
If the FixtureDef has cached the result it will do nothing, otherwise it will
setup and run the fixture, cache the value, and schedule a finalizer for it.
"""
# prepare a subrequest object before calling fixture function
# (latter managed by fixturedef)
argname = fixturedef.argname
funcitem = self._pyfuncitem funcitem = self._pyfuncitem
try: try:
callspec = funcitem.callspec callspec = funcitem.callspec
@ -627,7 +608,7 @@ class FixtureRequest(abc.ABC):
) )
fail(msg, pytrace=False) fail(msg, pytrace=False)
if has_params: if has_params:
frame = inspect.stack()[3] frame = inspect.stack()[2]
frameinfo = inspect.getframeinfo(frame[0]) frameinfo = inspect.getframeinfo(frame[0])
source_path = absolutepath(frameinfo.filename) source_path = absolutepath(frameinfo.filename)
source_lineno = frameinfo.lineno source_lineno = frameinfo.lineno
@ -658,6 +639,14 @@ class FixtureRequest(abc.ABC):
# Make sure the fixture value is cached, running it if it isn't # Make sure the fixture value is cached, running it if it isn't
fixturedef.execute(request=subrequest) fixturedef.execute(request=subrequest)
self._fixture_defs[argname] = fixturedef
return fixturedef
def _get_fixturestack(self) -> List["FixtureDef[Any]"]:
values = [request._fixturedef for request in self._iter_chain()]
values.reverse()
return values
@final @final
class TopRequest(FixtureRequest): class TopRequest(FixtureRequest):