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

Use session.config.hook instead of ihook. Fixes #2124

Browse Source
This commit is contained in:
Dmitry Malinovsky
2016-12-10 16:45:40 +06:00
parent da40bcf97f
commit 522d59e844
2 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/fixtures.py
View File

@@ -754,8 +754,8 @@ class FixtureDef:
func = self._finalizer.pop()
func()
finally:
ihook = self._fixturemanager.session.ihook
ihook.pytest_fixture_post_finalizer(fixturedef=self)
hook = self._fixturemanager.session.config.hook
hook.pytest_fixture_post_finalizer(fixturedef=self)
# even if finalization fails, we invalidate
# the cached fixture value
if hasattr(self, "cached_result"):
@@ -783,8 +783,8 @@ class FixtureDef:
self.finish()
assert not hasattr(self, "cached_result")
ihook = self._fixturemanager.session.ihook
return ihook.pytest_fixture_setup(fixturedef=self, request=request)
hook = self._fixturemanager.session.config.hook
return hook.pytest_fixture_setup(fixturedef=self, request=request)
def __repr__(self):
return ("<FixtureDef name=%r scope=%r baseid=%r >" %