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

Make config no longer optional in parametrize id functions

This commit is contained in:
Bruno Oliveira 2018-09-04 16:55:52 -03:00
parent 6d497f2c77
commit 5a52acaa92
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/python.py
View File

@ -1158,7 +1158,7 @@ def _find_parametrized_scope(argnames, arg2fixturedefs, indirect):
return "function" return "function"
def _idval(val, argname, idx, idfn, item, config=None): def _idval(val, argname, idx, idfn, item, config):
if idfn: if idfn:
s = None s = None
try: try:
@ -1195,7 +1195,7 @@ def _idval(val, argname, idx, idfn, item, config=None):
return str(argname) + str(idx) return str(argname) + str(idx)
def _idvalset(idx, parameterset, argnames, idfn, ids, config=None, item=None): def _idvalset(idx, parameterset, argnames, idfn, ids, item, config):
if parameterset.id is not None: if parameterset.id is not None:
return parameterset.id return parameterset.id
if ids is None or (idx >= len(ids) or ids[idx] is None): if ids is None or (idx >= len(ids) or ids[idx] is None):
@ -1210,7 +1210,7 @@ def _idvalset(idx, parameterset, argnames, idfn, ids, config=None, item=None):
def idmaker(argnames, parametersets, idfn=None, ids=None, config=None, item=None): def idmaker(argnames, parametersets, idfn=None, ids=None, config=None, item=None):
ids = [ ids = [
_idvalset(valindex, parameterset, argnames, idfn, ids, config, item) _idvalset(valindex, parameterset, argnames, idfn, ids, config=config, item=item)
for valindex, parameterset in enumerate(parametersets) for valindex, parameterset in enumerate(parametersets)
] ]
if len(set(ids)) != len(ids): if len(set(ids)) != len(ids):

4
testing/python/metafunc.py
View File

@ -244,7 +244,7 @@ class TestMetafunc(object):
), ),
] ]
for val, expected in values: for val, expected in values:
assert _idval(val, "a", 6, None, item=None) == expected assert _idval(val, "a", 6, None, item=None, config=None) == expected
def test_bytes_idval(self): def test_bytes_idval(self):
"""unittest for the expected behavior to obtain ids for parametrized """unittest for the expected behavior to obtain ids for parametrized
@ -278,7 +278,7 @@ class TestMetafunc(object):
values = [(TestClass, "TestClass"), (test_function, "test_function")] values = [(TestClass, "TestClass"), (test_function, "test_function")]
for val, expected in values: for val, expected in values:
assert _idval(val, "a", 6, None, item=None) == expected assert _idval(val, "a", 6, None, item=None, config=None) == expected
@pytest.mark.issue250 @pytest.mark.issue250
def test_idmaker_autoname(self): def test_idmaker_autoname(self):