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

getting rid of redundant "active" attribute

This commit is contained in:
holger krekel 2012-11-19 12:42:10 +01:00
parent b940ed11a0
commit 2ef350aede
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
_pytest/python.py
View File

@ -1197,8 +1197,10 @@ class FixtureRequest(FuncargnamesCompatAttr):
self._fixturestack.pop() self._fixturestack.pop()
def _getfuncargvalue(self, fixturedef): def _getfuncargvalue(self, fixturedef):
if fixturedef.active: try:
return fixturedef.cached_result return fixturedef.cached_result # set by fixturedef.execute()
except AttributeError:
pass
# prepare request fixturename and param attributes before # prepare request fixturename and param attributes before
# calling into fixture function # calling into fixture function
@ -1619,7 +1621,6 @@ class FixtureDef:
startindex = unittest and 1 or None startindex = unittest and 1 or None
self.argnames = getfuncargnames(func, startindex=startindex) self.argnames = getfuncargnames(func, startindex=startindex)
self.unittest = unittest self.unittest = unittest
self.active = False
self._finalizer = [] self._finalizer = []
def addfinalizer(self, finalizer): def addfinalizer(self, finalizer):
@ -1631,9 +1632,11 @@ class FixtureDef:
func() func()
# check neccesity of next commented call # check neccesity of next commented call
self._fixturemanager.removefinalizer(self.finish) self._fixturemanager.removefinalizer(self.finish)
self.active = False
#print "finished", self #print "finished", self
#del self.cached_result try:
del self.cached_result
except AttributeError:
pass
def execute(self, request): def execute(self, request):
kwargs = {} kwargs = {}
@ -1655,7 +1658,7 @@ class FixtureDef:
except AttributeError: except AttributeError:
pass pass
result = fixturefunc(**kwargs) result = fixturefunc(**kwargs)
self.active = True assert not hasattr(self, "cached_result")
self.cached_result = result self.cached_result = result
return result return result