Fixed support for pytest marks under python 3 + pytest 2. Added a test to easily detect these in the future

Author: Sylvain MARIE

pytest_cases/main.py

@@ -124,15 +124,7 @@ def get_marks(self):
         Overrides default implementation to return the marks that are on the case function
         :return:
         """
-        try:
-            return self.f.pytestmark
-        except AttributeError:
-            try:
-                # old pytest < 3: marks are set as fields on the function object
-                # but they do not have a particulat type, their type is 'instance'...
-                return [v for v in self.f.func_dict.values() if str(v).startswith("<MarkInfo '")]
-            except AttributeError:
-                return []
+        return get_pytest_marks_on_case_func(self.f)
 
     def get(self, *args, **kwargs):
         # type: (...) -> Union[CaseData, Any]
@@ -144,6 +136,24 @@ def get(self, *args, **kwargs):
         return self.f(*args, **kwargs)
 
 
+def get_pytest_marks_on_case_func(f):
+    """
+    Utility to return all pytest marks applied on a case function
+
+    :param f:
+    :return:
+    """
+    try:
+        return f.pytestmark
+    except AttributeError:
+        try:
+            # old pytest < 3: marks are set as fields on the function object
+            # but they do not have a particulat type, their type is 'instance'...
+            return [v for v in vars(f).values() if str(v).startswith("<MarkInfo '")]
+        except AttributeError:
+            return []
+
+
 CASE_PREFIX = 'case_'
 """Prefix used by default to identify case functions within a module"""
 
@@ -506,11 +516,10 @@ def datasets_decorator(test_func):
 # Compatibility for the way we put marks on single parameters in the list passed to @pytest.mark.parametrize
 try:
     _ = pytest.param
-    def mark_unitary_case(c):
-        return pytest.param(c, marks=c.get_marks())
+    def get_marked_parameter_for_case(c, marks):
+        return pytest.param(c, marks=marks)
 except AttributeError:
-    def mark_unitary_case(c):
-        marks = c.get_marks()
+    def get_marked_parameter_for_case(c, marks):
         if len(marks) > 1:
             raise ValueError("Multiple marks on parameters not supported for old versions of pytest")
         else:
@@ -567,7 +576,7 @@ def get_all_cases(cases=None,               # type: Union[Callable[[Any], Any],
             _cases = extract_cases_from_module(m, has_tag=has_tag, filter=filter)
 
     # create the pytest parameters to handle pytest marks
-    _cases = [c if len(c.get_marks()) == 0 else mark_unitary_case(c) for c in _cases]
+    _cases = [c if len(c.get_marks()) == 0 else get_marked_parameter_for_case(c, marks=c.get_marks()) for c in _cases]
 
     return _cases
 

pytest_cases/tests/simple/test_pytest_marks.py

@@ -0,0 +1,22 @@
+import pytest
+
+from pytest_cases.main import get_pytest_marks_on_case_func, get_marked_parameter_for_case
+
+
+@pytest.mark.skipif(True, reason="why")
+def case_func():
+    pass
+
+
+def test_get_pytest_marks():
+    """
+    Tests that we are able to correctly retrieve the marks on case_func
+    :return:
+    """
+    # extract the marks from a case function
+    marks = get_pytest_marks_on_case_func(case_func)
+    assert len(marks) == 1
+
+    # transform a parameter into a marked parameter
+    dummy_case = (1, 2, 3)
+    marked_param = get_marked_parameter_for_case(dummy_case, marks=marks)