Now using decopatch to create the decorators.

Author: Sylvain MARIE

ci_tools/requirements-pip.txt

@@ -3,6 +3,7 @@ pytest-runner
 
 # -- to install
 makefun
+decopatch
 
 # --- to generate the reports (see scripts in ci_tools, called by .travis)
 pytest-html$PYTEST_HTML_VERSION

pytest_cases/case_funcs.py

@@ -1,5 +1,7 @@
 from __future__ import division
 
+from decopatch import DECORATED, function_decorator, with_parenthesis
+
 try:  # python 3.2+
     from functools import lru_cache as lru
 except ImportError:
@@ -40,7 +42,9 @@
 """Internal marker used for cases generators"""
 
 
-def case_name(name  # type: str
+@function_decorator
+def case_name(name,  # type: str
+              test_func=DECORATED
               ):
     """
     Decorator to override the name of a case function. The new name will be used instead of the function name,
@@ -55,16 +59,14 @@ def case_simple():
     :param name: the name that will be used in the test case instead of the case function name
     :return:
     """
-    def case_name_decorator(test_func):
-        test_func.__name__ = name
-        return test_func
-
-    return case_name_decorator
+    test_func.__name__ = name
+    return test_func
 
 
 CASE_TAGS_FIELD = '__case_tags__'
 
 
+@function_decorator(custom_disambiguator=with_parenthesis)
 def case_tags(*tags  # type: Any
               ):
     """
@@ -75,17 +77,18 @@ def case_tags(*tags  # type: Any
         functions...)
     :return:
     """
-    def case_tags_decorator(test_func):
-        existing_tags = getattr(test_func, CASE_TAGS_FIELD, None)
+    # we have to use "nested" mode for this decorator because in the decorator signature we have a var-positional
+    def _apply(case_func):
+        existing_tags = getattr(case_func, CASE_TAGS_FIELD, None)
         if existing_tags is None:
             # there are no tags yet. Use the provided
-            setattr(test_func, CASE_TAGS_FIELD, list(tags))
+            setattr(case_func, CASE_TAGS_FIELD, list(tags))
         else:
             # there are some tags already, let's try to add the new to the existing
-            setattr(test_func, CASE_TAGS_FIELD, existing_tags + list(tags))
-        return test_func
+            setattr(case_func, CASE_TAGS_FIELD, existing_tags + list(tags))
+        return case_func
 
-    return case_tags_decorator
+    return _apply
 
 
 def test_target(target  # type: Any
@@ -108,8 +111,10 @@ def test_target(target  # type: Any
 test_target.__test__ = False  # disable this function in pytest (otherwise name starts with 'test' > it will appear)
 
 
+@function_decorator
 def cases_generator(names=None,       # type: Union[str, Callable[[Any], str], Iterable[str]]
-                    lru_cache=False,  # type: bool
+                    lru_cache=False,  # type: bool,
+                    case_func=DECORATED,
                     **param_ranges    # type: Iterable[Any]
                     ):
     """
@@ -140,15 +145,11 @@ def cases_generator(names=None,       # type: Union[str, Callable[[Any], str], I
         function so they should have names the underlying function can handle.
     :return:
     """
-
-    def cases_generator_decorator(test_func):
-        kwarg_values = list(product(*param_ranges.values()))
-        setattr(test_func, _GENERATOR_FIELD, (names, param_ranges.keys(), kwarg_values))
-        if lru_cache:
-            nb_cases = len(kwarg_values)
-            # decorate the function with the appropriate lru cache size
-            test_func = lru(maxsize=nb_cases)(test_func)
-
-        return test_func
-
-    return cases_generator_decorator
+    kwarg_values = list(product(*param_ranges.values()))
+    setattr(case_func, _GENERATOR_FIELD, (names, param_ranges.keys(), kwarg_values))
+    if lru_cache:
+        nb_cases = len(kwarg_values)
+        # decorate the function with the appropriate lru cache size
+        case_func = lru(maxsize=nb_cases)(case_func)
+
+    return case_func

pytest_cases/main.py

@@ -7,6 +7,7 @@
 from distutils.version import LooseVersion
 from inspect import getmembers, isgeneratorfunction, getmodule
 
+from decopatch import function_decorator, DECORATED, with_parenthesis
 from makefun import with_signature, add_signature_parameters, remove_signature_parameters
 
 try:  # python 3.3+
@@ -167,11 +168,13 @@ def get_pytest_marks_on_case_func(f):
 """Marker that can be used instead of a module name to indicate that the module is the current one"""
 
 
+@function_decorator
 def cases_fixture(cases=None,                       # type: Union[Callable[[Any], Any], Iterable[Callable[[Any], Any]]]
                   module=None,                      # type: Union[ModuleType, Iterable[ModuleType]]
                   case_data_argname='case_data',    # type: str
                   has_tag=None,                     # type: Any
                   filter=None,                      # type: Callable[[List[Any]], bool]
+                  f=DECORATED,
                   **kwargs
                   ):
     """
@@ -239,23 +242,22 @@ def foo_fixture(request):
         `module`. It both `has_tag` and `filter` are set, both will be applied in sequence.
     :return:
     """
-    def _double_decorator(f):
-        # apply @cases_data (that will translate to a @pytest.mark.parametrize)
-        parametrized_f = cases_data(cases=cases, module=module,
-                                    case_data_argname=case_data_argname, has_tag=has_tag, filter=filter)(f)
-        # apply @pytest_fixture_plus
-        return pytest_fixture_plus(**kwargs)(parametrized_f)
-
-    return _double_decorator
+    # apply @cases_data (that will translate to a @pytest.mark.parametrize)
+    parametrized_f = cases_data(cases=cases, module=module,
+                                case_data_argname=case_data_argname, has_tag=has_tag, filter=filter)(f)
+    # apply @pytest_fixture_plus
+    return pytest_fixture_plus(**kwargs)(parametrized_f)
 
 
+@function_decorator
 def pytest_fixture_plus(scope="function",
                         params=None,
                         autouse=False,
                         ids=None,
                         name=None,
+                        fixture_func=DECORATED,
                         **kwargs):
-    """ (return a) decorator to mark a fixture factory function.
+    """ decorator to mark a fixture factory function.
 
     Identical to `@pytest.fixture` decorator, except that it supports multi-parametrization with
     `@pytest.mark.parametrize` as requested in https://github.com/pytest-dev/pytest/issues/3960.
@@ -280,52 +282,6 @@ def pytest_fixture_plus(scope="function",
                 ``@pytest.fixture(name='<fixturename>')``.
     :param kwargs: other keyword arguments for `@pytest.fixture`
     """
-
-    if callable(scope) and params is None and autouse is False:
-        # direct decoration without arguments
-        return decorate_pytest_fixture_plus(scope)
-    else:
-        # arguments have been provided
-        def _decorator(f):
-            return decorate_pytest_fixture_plus(f,
-                                                scope=scope, params=params, autouse=autouse, ids=ids, name=name,
-                                                **kwargs)
-        return _decorator
-
-
-def decorate_pytest_fixture_plus(fixture_func,
-                                 scope="function",
-                                 params=None,
-                                 autouse=False,
-                                 ids=None,
-                                 name=None,
-                                 **kwargs):
-    """
-    Manual decorator equivalent to `@pytest_fixture_plus`
-
-    :param fixture_func: the function to decorate
-
-    :param scope: the scope for which this fixture is shared, one of
-                "function" (default), "class", "module" or "session".
-    :param params: an optional list of parameters which will cause multiple
-                invocations of the fixture function and all of the tests
-                using it.
-    :param autouse: if True, the fixture func is activated for all tests that
-                can see it.  If False (the default) then an explicit
-                reference is needed to activate the fixture.
-    :param ids: list of string ids each corresponding to the params
-                so that they are part of the test id. If no ids are provided
-                they will be generated automatically from the params.
-    :param name: the name of the fixture. This defaults to the name of the
-                decorated function. If a fixture is used in the same module in
-                which it is defined, the function name of the fixture will be
-                shadowed by the function arg that requests the fixture; one way
-                to resolve this is to name the decorated function
-                ``fixture_<fixturename>`` and then use
-                ``@pytest.fixture(name='<fixturename>')``.
-    :param kwargs:
-    :return:
-    """
     # Compatibility for the 'name' argument
     if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
         # pytest version supports "name" keyword argument
@@ -436,11 +392,13 @@ def wrapped_fixture_func(*args, **kwargs):
         return fixture_decorator(wrapped_fixture_func)
 
 
+@function_decorator(custom_disambiguator=with_parenthesis)
 def cases_data(cases=None,                       # type: Union[Callable[[Any], Any], Iterable[Callable[[Any], Any]]]
                module=None,                      # type: Union[ModuleType, Iterable[ModuleType]]
                case_data_argname='case_data',    # type: str
                has_tag=None,                     # type: Any
-               filter=None                       # type: Callable[[List[Any]], bool]
+               filter=None,                      # type: Callable[[List[Any]], bool]
+               test_func=DECORATED,
                ):
     """
     Decorates a test function so as to automatically parametrize it with all cases listed in module `module`, or with
@@ -496,28 +454,18 @@ def test_foo(case_data: CaseData):
         `module`. It both `has_tag` and `filter` are set, both will be applied in sequence.
     :return:
     """
-    def datasets_decorator(test_func):
-        """
-        The generated test function decorator.
-
-        It is equivalent to @mark.parametrize('case_data', cases) where cases is a tuple containing a CaseDataGetter for
-        all case generator functions
+    # equivalent to @mark.parametrize('case_data', cases) where cases is a tuple containing a CaseDataGetter for
 
-        :param test_func:
-        :return:
-        """
-        # First list all cases according to user preferences
-        _cases = get_all_cases(cases, module, test_func, has_tag, filter)
+    # First list all cases according to user preferences
+    _cases = get_all_cases(cases, module, test_func, has_tag, filter)
 
-        # Then transform into required arguments for pytest (applying the pytest marks if needed)
-        marked_cases, cases_ids = get_pytest_parametrize_args(_cases)
+    # Then transform into required arguments for pytest (applying the pytest marks if needed)
+    marked_cases, cases_ids = get_pytest_parametrize_args(_cases)
 
-        # Finally create the pytest decorator and apply it
-        parametrizer = pytest.mark.parametrize(case_data_argname, marked_cases, ids=cases_ids)
+    # Finally create the pytest decorator and apply it
+    parametrizer = pytest.mark.parametrize(case_data_argname, marked_cases, ids=cases_ids)
 
-        return parametrizer(test_func)
-
-    return datasets_decorator
+    return parametrizer(test_func)
 
 
 def get_pytest_parametrize_args(cases):
@@ -542,7 +490,6 @@ def get_pytest_parametrize_args(cases):
     return marked_cases, case_ids
 
 
-
 # Compatibility for the way we put marks on single parameters in the list passed to @pytest.mark.parametrize
 # see https://docs.pytest.org/en/3.3.0/skipping.html?highlight=mark%20parametrize#skip-xfail-with-parametrize
 

setup.py

@@ -11,7 +11,7 @@
 here = path.abspath(path.dirname(__file__))
 
 # *************** Dependencies *********
-INSTALL_REQUIRES = ['makefun', 'functools32;python_version<"3.2"', 'funcsigs;python_version<"3.3"']
+INSTALL_REQUIRES = ['decopatch', 'makefun', 'functools32;python_version<"3.2"', 'funcsigs;python_version<"3.3"']
 DEPENDENCY_LINKS = []
 SETUP_REQUIRES = ['pytest-runner', 'setuptools_scm', 'pypandoc', 'pandoc']
 TESTS_REQUIRE = ['pytest', 'pytest-logging', 'pytest-cov', 'pytest-steps']