More explicit edgecase of decorators

Author: eitanwass

changelog/12863.bugfix.rst

@@ -1 +1 @@
-Fix :ref:`pytest.mark.parametrize <pytest.mark.parametrize ref>` marker placed above `@staticmethod`
+Fix applying markers, including :ref:`pytest.mark.parametrize <pytest.mark.parametrize ref>` when placed above `@staticmethod` or `@classmethod`.

src/_pytest/mark/structures.py

@@ -349,9 +349,13 @@ def __call__(self, *args: object, **kwargs: object):
         if args and not kwargs:
             func = args[0]
             is_class = inspect.isclass(func)
-            marking_func = getattr(func, "__func__", func)
-            if len(args) == 1 and (istestfunc(marking_func) or is_class):
-                store_mark(marking_func, self.mark, stacklevel=3)
+            # For staticmethods/classmethods, the marks are eventually fetched from the
+            # function object, not the descriptor, so unwrap.
+            unwrapped_func = func
+            if isinstance(func, (staticmethod, classmethod)):
+                unwrapped_func = func.__func__
+            if len(args) == 1 and (istestfunc(unwrapped_func) or is_class):
+                store_mark(unwrapped_func, self.mark, stacklevel=3)
                 return func
         return self.with_args(*args, **kwargs)
 

testing/test_mark.py

@@ -1228,7 +1228,6 @@ def test_attrs(self):
     result.assert_outcomes(passed=1)
 
 
-# @pytest.mark.issue("https://github.com/pytest-dev/pytest/issues/12863")
 def test_mark_parametrize_over_staticmethod(pytester: Pytester) -> None:
     """Check that applying marks works as intended on classmethods and staticmethods.