p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixtures: use node.ihook instead of open-coding it

This commit is contained in:
Ran Benita 2022-01-19 15:42:04 +02:00
parent 4c8fb6f0af
commit 6672a10354
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/_pytest/fixtures.py
View File

@ -992,8 +992,8 @@ class FixtureDef(Generic[FixtureValue]):
if exc: if exc:
raise exc raise exc
finally: finally:
hook = self._fixturemanager.session.gethookproxy(request.node.path) ihook = request.node.ihook
hook.pytest_fixture_post_finalizer(fixturedef=self, request=request) ihook.pytest_fixture_post_finalizer(fixturedef=self, request=request)
# Even if finalization fails, we invalidate the cached fixture # Even if finalization fails, we invalidate the cached fixture
# value and remove all finalizers because they may be bound methods # value and remove all finalizers because they may be bound methods
# which will keep instances alive. # which will keep instances alive.
@ -1027,8 +1027,8 @@ class FixtureDef(Generic[FixtureValue]):
self.finish(request) self.finish(request)
assert self.cached_result is None assert self.cached_result is None
hook = self._fixturemanager.session.gethookproxy(request.node.path) ihook = request.node.ihook
result = hook.pytest_fixture_setup(fixturedef=self, request=request) result = ihook.pytest_fixture_setup(fixturedef=self, request=request)
return result return result
def cache_key(self, request: SubRequest) -> object: def cache_key(self, request: SubRequest) -> object: