Pytest marks such as @pytest.mark.skipif can now be used on case functions. As a consequence, get_all_cases is now the recommended function to use instead of extract_cases_from_module to perform manual collection. Indeed get_all_cases correctly prepares the resulting parameters list so that pytest sees the marks. Fixed #21

Author: Sylvain MARIE

docs/api_reference.md

@@ -175,13 +175,13 @@ is equivalent to:
 
 ```python
 import pytest
-from pytest_cases import extract_cases_from_module, CaseData
+from pytest_cases import get_all_cases, CaseData
 
 # import the module containing the test cases
 import test_foo_cases
 
 # manually list the available cases
-cases = extract_cases_from_module(test_foo_cases)
+cases = get_all_cases(module=test_foo_cases)
 
 # parametrize the test function manually
 @pytest.mark.parametrize('case_data', cases, ids=str)
@@ -196,7 +196,7 @@ def test_foo(case_data: CaseData):
 
 ### `CaseDataGetter`
 
-A proxy for a test case. Instances of this class are created by `@cases_data` or `extract_cases_from_module`. It provides a single method:
+A proxy for a test case. Instances of this class are created by `@cases_data` or `get_all_cases`. It provides a single method:
 
 `get(self, *args, **kwargs) -> Union[CaseData, Any]`
 

docs/usage/advanced.md

@@ -396,13 +396,13 @@ The `@cases_data` decorator is just syntactic sugar for the following two-steps
 
 ```python
 import pytest
-from pytest_cases import extract_cases_from_module, CaseData
+from pytest_cases import get_all_cases, CaseData
 
 # import the module containing the test cases
 import test_foo_cases
 
 # manually list the available cases
-cases = extract_cases_from_module(test_foo_cases)
+cases = get_all_cases(module=test_foo_cases)
 
 # parametrize the test function manually
 @pytest.mark.parametrize('case_data', cases, ids=str)

pytest_cases/__init__.py

@@ -6,15 +6,14 @@
     pass
 
 from pytest_cases.main import cases_data, CaseDataGetter, cases_fixture, pytest_fixture_plus, \
-    unfold_expected_err, get_all_cases, extract_cases_from_module, THIS_MODULE
+    unfold_expected_err, get_all_cases, THIS_MODULE
 
 __all__ = [
     # the 3 submodules
     'main', 'case_funcs', 'common',
     # all symbols imported above
     'cases_data', 'CaseData', 'CaseDataGetter', 'cases_fixture', 'pytest_fixture_plus',
     'unfold_expected_err', 'get_all_cases',
-    'extract_cases_from_module',
     'case_name', 'Given', 'ExpectedNormal', 'ExpectedError',
     'test_target', 'case_tags', 'THIS_MODULE', 'cases_generator', 'MultipleStepsCaseData'
 ]

pytest_cases/main.py

@@ -44,7 +44,7 @@
 
 class CaseDataGetter(six.with_metaclass(ABCMeta)):
     """
-    A proxy for a test case. Instances of this class are created by `@cases_data` or `extract_cases_from_module`.
+    A proxy for a test case. Instances of this class are created by `@cases_data` or `get_all_cases`.
 
     It provides a single method: `get(self, *args, **kwargs) -> CaseData`
     This method calls the actual underlying case with arguments propagation, and returns the result.
@@ -60,6 +60,13 @@ def get(self, *args, **kwargs):
         :return:
         """
 
+    def get_marks(self):
+        """
+        Returns the pytest marks on this case, if any
+        :return:
+        """
+        return []
+
     def get_for(self, key):
         # type: (...) -> CaseData
         """
@@ -112,6 +119,16 @@ def __str__(self):
     def __repr__(self):
         return "Test Case Data generator - [" + str(self) + "] - " + str(self.f)
 
+    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:
+            return []
+
     def get(self, *args, **kwargs):
         # type: (...) -> Union[CaseData, Any]
         """
@@ -171,7 +188,7 @@ def foo_fixture(case_data: CaseData):
 
     ```python
     import pytest
-    from pytest_cases import extract_cases_from_module, CaseData
+    from pytest_cases import get_all_cases, CaseData
 
     # import the module containing the test cases
     import test_foo_cases
@@ -525,6 +542,9 @@ def get_all_cases(cases=None,               # type: Union[Callable[[Any], Any],
             m = sys.modules[this_module_object.__module__] if module is THIS_MODULE else module
             _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 pytest.param(c, marks=c.get_marks()) for c in _cases]
+
     return _cases
 
 

pytest_cases/tests/advanced/test_memoize_generators.py

@@ -1,4 +1,4 @@
-from pytest_cases import cases_data, THIS_MODULE, cases_generator, CaseDataGetter, extract_cases_from_module
+from pytest_cases import cases_data, THIS_MODULE, cases_generator, CaseDataGetter, get_all_cases
 from pytest_cases.tests.utils import nb_pytest_parameters, get_pytest_param
 
 try:  # python 3+: type hints
@@ -40,7 +40,7 @@ def test_b(case_data   # type: CaseDataGetter
 def test_assert_cases_are_here():
     """Asserts that the 3 cases are generated"""
     import sys
-    cases = extract_cases_from_module(sys.modules[case_gen.__module__])
+    cases = get_all_cases(module=sys.modules[case_gen.__module__])
     assert len(cases) == 3
 
 

pytest_cases/tests/simple/test_main.py

@@ -1,7 +1,7 @@
 import pytest
 from pytest_cases.tests.example_code import super_function_i_want_to_test
 
-from pytest_cases import cases_data, CaseDataGetter, unfold_expected_err, extract_cases_from_module
+from pytest_cases import cases_data, CaseDataGetter, unfold_expected_err, get_all_cases
 from pytest_cases.tests.simple import test_main_cases
 
 
@@ -39,7 +39,7 @@ def test_with_cases_decorated(case_data  # type: CaseDataGetter
 
 
 # ----------------- Advanced: Manual way: -------------
-cases = extract_cases_from_module(test_main_cases)
+cases = get_all_cases(module=test_main_cases)
 
 
 @pytest.mark.parametrize('case_data', cases, ids=str)

pytest_cases/tests/simple/test_main_cases.py

@@ -1,3 +1,5 @@
+import pytest
+
 try: # python 3+
     from math import inf
 except ImportError:
@@ -64,3 +66,9 @@ def is_good_error(e):
         return type(e) is InfiniteInput and e.args == ('b',)
 
     return ins, None, is_good_error
+
+
+@pytest.mark.skip("skipped on purpose")
+def case_skipped():
+    """ A skipped case """
+    return