jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify loop which turns direct funcarg parametrization to indirect

This commit is contained in:
holger krekel 2014-01-27 12:53:44 +01:00
parent c70d020bf3
commit 86284689a3
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
_pytest/python.py
View File

@ -372,22 +372,22 @@ def add_funcarg_pseudo_fixture_def(collector, metafunc, fixturemanager):
# collect funcargs of all callspecs into a list of values # collect funcargs of all callspecs into a list of values
arg2params = {} arg2params = {}
arg2scope = {} arg2scope = {}
arg2fixturedefs = metafunc._arg2fixturedefs for callspec in metafunc._calls:
for param_index, callspec in enumerate(metafunc._calls):
for argname, argvalue in callspec.funcargs.items(): for argname, argvalue in callspec.funcargs.items():
arg2params.setdefault(argname, []).append(argvalue)
if argname not in arg2scope:
scopenum = callspec._arg2scopenum.get(argname, scopenum_function)
arg2scope[argname] = scopes[scopenum]
callspec.indices[argname] = param_index
for argname in callspec.funcargs:
assert argname not in callspec.params assert argname not in callspec.params
callspec.params.update(callspec.funcargs) callspec.params[argname] = argvalue
arg2params_list = arg2params.setdefault(argname, [])
callspec.indices[argname] = len(arg2params_list)
arg2params_list.append(argvalue)
if argname not in arg2scope:
scopenum = callspec._arg2scopenum.get(argname,
scopenum_function)
arg2scope[argname] = scopes[scopenum]
callspec.funcargs.clear() callspec.funcargs.clear()
# register artificial FixtureDef's so that later at test execution # register artificial FixtureDef's so that later at test execution
# time we can rely on a proper FixtureDef to exist for fixture setup. # time we can rely on a proper FixtureDef to exist for fixture setup.
arg2fixturedefs = metafunc._arg2fixturedefs
for argname, valuelist in arg2params.items(): for argname, valuelist in arg2params.items():
# if we have a scope that is higher than function we need # if we have a scope that is higher than function we need
# to make sure we only ever create an according fixturedef on # to make sure we only ever create an according fixturedef on

1
testing/python/fixture.py
View File

@ -1391,6 +1391,7 @@ class TestAutouseManagement:
reprec = testdir.inline_run("-s") reprec = testdir.inline_run("-s")
reprec.assertoutcome(passed=2) reprec.assertoutcome(passed=2)
class TestFixtureMarker: class TestFixtureMarker:
def test_parametrize(self, testdir): def test_parametrize(self, testdir):
testdir.makepyfile(""" testdir.makepyfile("""