Fixed bug with concatenation of marks on cases. Fixes #191

Author: Sylvain MARIE

pytest_cases/case_funcs.py

@@ -49,7 +49,7 @@ def __init__(self,
                  tags=()    # type: Tuple[Any]
                  ):
         self.id = id
-        self.marks = marks
+        self.marks = marks  # type: Tuple[MarkDecorator, ...]
         self.tags = ()
         self.add_tags(tags)
 
@@ -180,6 +180,7 @@ def get_case_marks(case_func,                         # type: Callable
                    concatenate_with_fun_marks=False,  # type: bool
                    as_decorators=False                # type: bool
                    ):
+    # type: (...) -> Union[Tuple[Mark, ...], Tuple[MarkDecorator, ...]]
     """Return the marks that are on the case function.
 
     There are currently two ways to place a mark on a case function: either with `@pytest.mark.<name>` or in
@@ -198,12 +199,14 @@ def get_case_marks(case_func,                         # type: Callable
     if _ci is None:
         _ci_marks = None
     else:
+        # convert the MarkDecorators to Marks if needed
         _ci_marks = _ci.marks if as_decorators else markdecorators_to_markinfos(_ci.marks)
 
     if not concatenate_with_fun_marks:
         return _ci_marks
     else:
-        fun_marks = get_pytest_marks_on_function(case_func, as_decorators=as_decorators)
+        # concatenate the marks on the `_CaseInfo` with the ones on `case_func`
+        fun_marks = tuple(get_pytest_marks_on_function(case_func, as_decorators=as_decorators))
         return (_ci_marks + fun_marks) if _ci_marks else fun_marks
 
 

pytest_cases/case_parametrizer_new.py

@@ -337,7 +337,7 @@ def case_to_argvalues(host_class_or_module,    # type: Union[Type, ModuleType]
     if not meta.requires_fixtures and not meta.is_parametrized:
         # only retrieve the extra marks added with @case, since the others will be automatically retrieved by the
         # lazy_value.
-        case_marks = get_case_marks(case_fun)
+        case_marks = get_case_marks(case_fun, as_decorators=True)
 
         # if not meta.is_parametrized:
         # single unparametrized case function

pytest_cases/common_pytest_lazy_values.py

@@ -11,7 +11,7 @@
     from funcsigs import signature  # noqa
 
 try:
-    from typing import Union, Callable, List, Set, Tuple, Any, Sequence, Optional  # noqa
+    from typing import Union, Callable, List, Set, Tuple, Any, Sequence, Optional, Iterable  # noqa
 except ImportError:
     pass
 
@@ -20,8 +20,8 @@
 except ImportError:
     pass
 
-from .common_pytest_marks import get_pytest_marks_on_function, markinfos_to_markdecorators, markdecorators_as_tuple, \
-    PYTEST53_OR_GREATER
+from .common_pytest_marks import get_pytest_marks_on_function, markdecorators_as_tuple, PYTEST53_OR_GREATER, \
+    markdecorators_to_markinfos
 
 
 class Lazy(object):
@@ -156,26 +156,34 @@ def copy_from(cls,
     def __init__(self,
                  valuegetter,  # type: Callable[[], Any]
                  id=None,      # type: str  # noqa
-                 marks=None,   # type: Union[MarkDecorator, Tuple[MarkDecorator, ...], List[MarkDecorator], Set[MarkDecorator]]
+                 marks=None,   # type: Union[MarkDecorator, Iterable[MarkDecorator]]
                  ):
         self.valuegetter = valuegetter
         self._id = id
         self._marks = markdecorators_as_tuple(marks)
         self.cached_value_context = None
         self.cached_value = None
 
-    def get_marks(self, as_decorators=False):
+    def get_marks(self,
+                  as_decorators=False  # type: bool
+                  ):
+        # type: (...) -> Union[Tuple[Mark, ...], Tuple[MarkDecorator, ...]]
         """
         Overrides default implementation to return the marks that are on the case function
 
         :param as_decorators: when True, the marks (MarkInfo) will be transformed into MarkDecorators before being
             returned
         :return:
         """
-        valuegetter_marks = get_pytest_marks_on_function(self.valuegetter, as_decorators=as_decorators)
+        valuegetter_marks = tuple(get_pytest_marks_on_function(self.valuegetter, as_decorators=as_decorators))
 
         if self._marks:
-            self_marks = markinfos_to_markdecorators(self._marks, function_marks=True) if as_decorators else self._marks
+            if as_decorators:
+                # self_marks = markinfos_to_markdecorators(self._marks, function_marks=True)
+                self_marks = self._marks
+            else:
+                self_marks = markdecorators_to_markinfos(self._marks)
+
             return self_marks + valuegetter_marks
         else:
             return valuegetter_marks
@@ -423,7 +431,7 @@ def clone(self, remove_int_base=False):
 
 def lazy_value(valuegetter,  # type: Callable[[], Any]
                id=None,      # type: str  # noqa
-               marks=()      # type: Union[Any, Sequence[Any]]
+               marks=()      # type: Union[MarkDecorator, Iterable[MarkDecorator]]
                ):
     """
     Creates a reference to a value getter, to be used in `parametrize_plus`.

pytest_cases/common_pytest_marks.py

@@ -22,7 +22,7 @@
 try:
     from _pytest.mark.structures import MarkDecorator, Mark  # noqa
 except ImportError:
-    pass
+    from _pytest.mark import MarkDecorator, MarkInfo as Mark  # noqa
 
 from .common_mini_six import string_types
 
@@ -114,15 +114,26 @@ def copy_pytest_marks(from_f, to_f, override=False):
     to_f.pytestmark = to_marks + from_marks
 
 
-def filter_marks(marks,
+def filter_marks(marks,  # type: Iterable[Mark]
                  remove  # type: str
                  ):
-    return [m for m in marks if m.name != remove]
+    # type: (...) -> Tuple[Mark]
+    """
+    Returns a tuple of all marks in `marks` that do not have a 'parametrize' name.
+
+    :param marks:
+    :param remove:
+    :return:
+    """
+    return tuple(m for m in marks if m.name != remove)
 
 
-def get_pytest_marks_on_function(f, as_decorators=False):
+def get_pytest_marks_on_function(f,
+                                 as_decorators=False  # type: bool
+                                 ):
+    # type: (...) -> Union[List[Mark], List[MarkDecorator]]
     """
-    Utility to return *ALL* pytest marks (not only parametrization) applied on a function
+    Utility to return a list of *ALL* pytest marks (not only parametrization) applied on a function
     Note that this also works on classes
 
     :param f:
@@ -146,6 +157,14 @@ def get_pytest_marks_on_function(f, as_decorators=False):
         return mks
 
 
+def get_pytest_marks_on_item(item):
+    """lists all marks on an item such as `request._pyfuncitem`"""
+    if PYTEST3_OR_GREATER:
+        return item.callspec.marks
+    else:
+        return [val for val in item.keywords.values() if isinstance(val, (MarkDecorator, Mark))]
+
+
 def get_pytest_usefixture_marks(f):
     # pytest > 3.2.0
     marks = getattr(f, 'pytestmark', None)
@@ -253,10 +272,13 @@ def make_marked_parameter_value(argvalues_tuple, marks):
 def markinfos_to_markdecorators(marks,                # type: Iterable[Mark]
                                 function_marks=False  # type: bool
                                 ):
+    # type: (...) -> List[MarkDecorator]
     """
     Transforms the provided marks (MarkInfo or Mark in recent pytest) obtained from marked cases, into MarkDecorator so
     that they can be re-applied to generated pytest parameters in the global @pytest.mark.parametrize.
 
+    Returns a list.
+
     :param marks:
     :param function_marks:
     :return:
@@ -297,7 +319,7 @@ def markinfos_to_markdecorators(marks,                # type: Iterable[Mark]
     return marks_mod
 
 
-def markdecorators_as_tuple(marks  # type: Optional[Union[MarkDecorator, Tuple[MarkDecorator, ...], List[MarkDecorator], Set[MarkDecorator]]]
+def markdecorators_as_tuple(marks  # type: Optional[Union[MarkDecorator, Iterable[MarkDecorator]]]
                             ):
     # type: (...) -> Tuple[MarkDecorator, ...]
     """
@@ -306,18 +328,23 @@ def markdecorators_as_tuple(marks  # type: Optional[Union[MarkDecorator, Tuple[M
     :param marks:
     :return:
     """
-    if isinstance(marks, (tuple, list, set)):
+    if marks is None:
+        return ()
+
+    try:
+        # iterable ?
         return tuple(marks)
-    elif marks is not None:
+    except TypeError:
+        # single
         return (marks,)
 
 
 def markdecorators_to_markinfos(marks  # type: Sequence[MarkDecorator]
                                 ):
+    # type: (...) -> Tuple[Mark, ...]
     if PYTEST3_OR_GREATER:
         return tuple(m.mark for m in marks)
+    elif len(marks) == 0:
+        return ()
     else:
-        if len(marks) == 0:
-            return ()
-        else:
-            raise NotImplementedError("TODO")
+        return tuple(Mark(m.name, m.args, m.kwargs) for m in marks)

pytest_cases/fixture_parametrize_plus.py

@@ -1185,7 +1185,7 @@ def _process_argvalues(argnames, marked_argvalues, nb_params, has_custom_ids, au
                 _mks = v.get_marks(as_decorators=True)
                 if len(_mks) > 0:
                     # update/create the pytest.param marks on this value
-                    p_marks[i] = (list(p_marks[i]) + _mks) if p_marks[i] is not None else list(_mks)
+                    p_marks[i] = (p_marks[i] + _mks) if p_marks[i] is not None else _mks
 
                     # update the original marked_argvalues. Note that argvalues[i] = v
                     marked_argvalues[i] = ParameterSet(values=(argvalues[i],), id=p_ids[i], marks=p_marks[i])
@@ -1282,7 +1282,7 @@ def _process_argvalues(argnames, marked_argvalues, nb_params, has_custom_ids, au
                 _mks = v.get_marks(as_decorators=True)
                 if len(_mks) > 0:
                     # update/create the pytest.param marks on this value
-                    p_marks[i] = (list(p_marks[i]) + _mks) if p_marks[i] is not None else list(_mks)
+                    p_marks[i] = (p_marks[i] + _mks) if p_marks[i] is not None else _mks
 
                 # update the marked_argvalues
                 # - at least with the unpacked lazytuple if no pytest.param is there or needs to be created

pytest_cases/tests/cases/issues/test_issue_191.py

@@ -0,0 +1,33 @@
+import pytest
+
+from pytest_cases.common_pytest_marks import get_pytest_marks_on_item
+from pytest_cases import case, parametrize_with_cases, fixture
+
+
+@fixture
+def my_fix():
+    return 2
+
+
+class CasesFeature:
+    @case(tags=["categorical"], marks=pytest.mark.fast)
+    def case_no_fixture(self):
+        return 1
+
+    @case(tags=["med", "categorical"], marks=pytest.mark.slow)
+    def case_fixture(self, my_fix):
+        return my_fix
+
+
+@parametrize_with_cases("data", cases=CasesFeature, has_tag="categorical")
+def test_marks(data, request):
+    """Make sure that the marks are correctly set"""
+
+    current_marks = get_pytest_marks_on_item(request._pyfuncitem)
+    assert len(current_marks) == 1
+    if data == 1:
+        assert current_marks[0].name == "fast"
+    elif data == 2:
+        assert current_marks[0].name == "slow"
+    else:
+        raise AssertionError()