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

avoid maintaining a fixturestack

This commit is contained in:
holger krekel 2013-11-21 12:42:22 +01:00
parent 49119e31bf
commit 238b890d9b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
_pytest/python.py
View File

@ -1298,8 +1298,7 @@ class FixtureRequest(FuncargnamesCompatAttr):
else: else:
scope = self.scope scope = self.scope
subrequest = SubRequest(self, argname, scope, param, subrequest = SubRequest(self, scope, param, fixturedef)
fixturedef.addfinalizer)
try: try:
# perform the fixture call # perform the fixture call
val = fixturedef.execute(request=subrequest) val = fixturedef.execute(request=subrequest)
@ -1349,13 +1348,13 @@ notset = object()
class SubRequest(FixtureRequest): class SubRequest(FixtureRequest):
""" a sub request for handling getting a fixture from a """ a sub request for handling getting a fixture from a
test function/fixture. """ test function/fixture. """
def __init__(self, request, argname, scope, param, addfinalizer): def __init__(self, request, scope, param, fixturedef):
self._parent_request = request self._parent_request = request
self.fixturename = argname self.fixturename = fixturedef.argname
if param is not notset: if param is not notset:
self.param = param self.param = param
self.scope = scope self.scope = scope
self.addfinalizer = addfinalizer self.addfinalizer = fixturedef.addfinalizer
self._pyfuncitem = request._pyfuncitem self._pyfuncitem = request._pyfuncitem
self._funcargs = request._funcargs self._funcargs = request._funcargs
self._arg2fixturedefs = request._arg2fixturedefs self._arg2fixturedefs = request._arg2fixturedefs