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

Fix pytest.parametrize when argnames are specified as kwarg

This commit is contained in:
Leonard Lausen 2017-10-08 12:23:26 +09:00
parent 761d552814
commit c24ffa3b4c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/fixtures.py
View File

@ -1037,8 +1037,12 @@ class FixtureManager:
if faclist: if faclist:
fixturedef = faclist[-1] fixturedef = faclist[-1]
if fixturedef.params is not None: if fixturedef.params is not None:
func_params = getattr(getattr(metafunc.function, 'parametrize', None), 'args', [[None]]) parametrize_func = getattr(metafunc.function, 'parametrize', None)
func_params = getattr(parametrize_func, 'args', [[None]])
# skip directly parametrized arguments # skip directly parametrized arguments
if "argnames" in parametrize_func.kwargs:
argnames = parametrize_func.kwargs["argnames"]
else:
argnames = func_params[0] argnames = func_params[0]
if not isinstance(argnames, (tuple, list)): if not isinstance(argnames, (tuple, list)):
argnames = [x.strip() for x in argnames.split(",") if x.strip()] argnames = [x.strip() for x in argnames.split(",") if x.strip()]