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

fix #3605 - unpack markdecorators from parameterization

This commit is contained in:
Ronny Pfannschmidt 2018-06-21 08:00:23 +02:00
parent 78a82c05ef
commit b8486037d3
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/3605.bugfix.rst Normal file
View File

@ -0,0 +1 @@
unpack marks from parameterization to prevent the markdecorator missmatch bug.

5
src/_pytest/mark/structures.py
View File

@ -225,9 +225,12 @@ def get_unpacked_marks(obj):
obtain the unpacked marks that are stored on an object obtain the unpacked marks that are stored on an object
""" """
mark_list = getattr(obj, "pytestmark", []) mark_list = getattr(obj, "pytestmark", [])
if not isinstance(mark_list, list): if not isinstance(mark_list, list):
mark_list = [mark_list] mark_list = [mark_list]
return normalize_mark_list(mark_list)
def normalize_mark_list(mark_list):
return [getattr(mark, "mark", mark) for mark in mark_list] # unpack MarkDecorator return [getattr(mark, "mark", mark) for mark in mark_list] # unpack MarkDecorator

10
src/_pytest/python.py
View File

@ -39,7 +39,11 @@ from _pytest.compat import (
get_default_arg_names, get_default_arg_names,
) )
from _pytest.outcomes import fail from _pytest.outcomes import fail
from _pytest.mark.structures import transfer_markers, get_unpacked_marks from _pytest.mark.structures import (
transfer_markers,
get_unpacked_marks,
normalize_mark_list,
)
# relative paths that we use to filter traceback entries from appearing to the user; # relative paths that we use to filter traceback entries from appearing to the user;
@ -773,7 +777,7 @@ class CallSpec2(object):
self.indices[arg] = param_index self.indices[arg] = param_index
self._arg2scopenum[arg] = scopenum self._arg2scopenum[arg] = scopenum
self._idlist.append(id) self._idlist.append(id)
self.marks.extend(marks) self.marks.extend(normalize_mark_list(marks))
def setall(self, funcargs, id, param): def setall(self, funcargs, id, param):
for x in funcargs: for x in funcargs:
@ -1254,7 +1258,7 @@ class Function(FunctionMixin, nodes.Item, fixtures.FuncargnamesCompatAttr):
# feel free to cry, this was broken for years before # feel free to cry, this was broken for years before
# and keywords cant fix it per design # and keywords cant fix it per design
self.keywords[mark.name] = mark self.keywords[mark.name] = mark
self.own_markers.extend(callspec.marks) self.own_markers.extend(normalize_mark_list(callspec.marks))
if keywords: if keywords:
self.keywords.update(keywords) self.keywords.update(keywords)

2
testing/test_mark.py
View File

@ -1168,4 +1168,4 @@ def test_markers_from_parametrize(testdir):
) )
result = testdir.runpytest() result = testdir.runpytest()
result.assert_outcomes(failed=0) result.assert_outcomes(passed=4)