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

Always report error about parametrize data that doesn't correspond to fixtures in test functions.

This commit is contained in:
elizabeth 2015-08-23 13:42:40 +03:00
parent f7bacd169e
commit 06585f5bdd
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
_pytest/python.py
View File

@ -893,15 +893,14 @@ class Metafunc(FuncargnamesCompatAttr):
scope = "function" scope = "function"
scopenum = scopes.index(scope) scopenum = scopes.index(scope)
valtypes = {} valtypes = {}
for arg in argnames:
if arg not in self.fixturenames:
raise ValueError("%r uses no fixture %r" %(self.function, arg))
if indirect is True: if indirect is True:
valtypes = dict.fromkeys(argnames, "params") valtypes = dict.fromkeys(argnames, "params")
elif indirect is False: elif indirect is False:
valtypes = dict.fromkeys(argnames, "funcargs") valtypes = dict.fromkeys(argnames, "funcargs")
#XXX should we also check for the opposite case?
for arg in argnames:
if arg not in self.fixturenames:
raise ValueError("%r uses no fixture %r" %(
self.function, arg))
elif isinstance(indirect, (tuple, list)): elif isinstance(indirect, (tuple, list)):
valtypes = dict.fromkeys(argnames, "funcargs") valtypes = dict.fromkeys(argnames, "funcargs")
for arg in indirect: for arg in indirect:

5
testing/python/metafunc.py
View File

@ -214,12 +214,11 @@ class TestMetafunc:
metafunc = self.Metafunc(func) metafunc = self.Metafunc(func)
metafunc.parametrize('x', [1], indirect=True) metafunc.parametrize('x', [1], indirect=True)
metafunc.parametrize('y', [2,3], indirect=True) metafunc.parametrize('y', [2,3], indirect=True)
metafunc.parametrize('unnamed', [1], indirect=True)
assert len(metafunc._calls) == 2 assert len(metafunc._calls) == 2
assert metafunc._calls[0].funcargs == {} assert metafunc._calls[0].funcargs == {}
assert metafunc._calls[1].funcargs == {} assert metafunc._calls[1].funcargs == {}
assert metafunc._calls[0].params == dict(x=1,y=2, unnamed=1) assert metafunc._calls[0].params == dict(x=1,y=2)
assert metafunc._calls[1].params == dict(x=1,y=3, unnamed=1) assert metafunc._calls[1].params == dict(x=1,y=3)
@pytest.mark.issue714 @pytest.mark.issue714
def test_parametrize_indirect_list(self): def test_parametrize_indirect_list(self):