parametrize with marked callable objects

Author: Sergey Chipiga

_pytest/python.py

@@ -7,7 +7,7 @@
 import types
 import sys
 import pytest
-from _pytest.mark import MarkDecorator, MarkerError
+from _pytest.mark import MarkDecorator, MarkerError, MarkInfo
 from py._code.code import TerminalRepr
 
 try:
@@ -981,6 +981,28 @@ def parametrize(self, argnames, argvalues, indirect=False, ids=None,
                 newmarks[newmark.markname] = newmark
                 argval = argval.args[-1]
             unwrapped_argvalues.append(argval)
+
+            if inspect.isclass(argval):
+                pytestmark = getattr(argval, 'pytestmark', None)
+
+                if pytestmark:
+                    if not isinstance(pytestmark, list):
+                        pytestmark = [pytestmark]
+
+                    for mark in pytestmark:
+                        newkeywords.setdefault(i, {}).setdefault(mark.markname,
+                                                                 mark)
+
+            if inspect.isfunction(argval):
+                for attr_name in dir(argval):
+                    if attr_name.startswith('_'):
+                        continue
+
+                    attr = getattr(argval, attr_name)
+                    if isinstance(attr, MarkInfo):
+                        newkeywords.setdefault(i, {}).setdefault(attr.name,
+                                                                 attr)
+
         argvalues = unwrapped_argvalues
 
         if not isinstance(argnames, (tuple, list)):

testing/python/collect.py

@@ -384,7 +384,6 @@ def test_archival_to_version(key, value):
         rec = testdir.inline_run()
         rec.assertoutcome(passed=2)
 
-
     def test_parametrize_with_non_hashable_values_indirect(self, testdir):
         """Test parametrization with non-hashable values with indirect parametrization."""
         testdir.makepyfile("""
@@ -412,7 +411,6 @@ def test_archival_to_version(key, value):
         rec = testdir.inline_run()
         rec.assertoutcome(passed=2)
 
-
     def test_parametrize_overrides_fixture(self, testdir):
         """Test parametrization when parameter overrides existing fixture with same name."""
         testdir.makepyfile("""
@@ -440,7 +438,6 @@ def test_overridden_via_multiparam(other, value):
         rec = testdir.inline_run()
         rec.assertoutcome(passed=3)
 
-
     def test_parametrize_overrides_parametrized_fixture(self, testdir):
         """Test parametrization when parameter overrides existing parametrized fixture with same name."""
         testdir.makepyfile("""
@@ -527,6 +524,32 @@ def test2(self, x, y):
         assert colitems[2].name == 'test2[a-c]'
         assert colitems[3].name == 'test2[b-c]'
 
+    def test_parametrize_with_marked_class(self, testdir):
+        testdir.makepyfile("""
+            import pytest
+
+            class A(object): pass
+
+            @pytest.mark.parametrize('a', [pytest.mark.xfail(A)])
+            def test_function(a):
+                assert False
+        """)
+        reprec = testdir.inline_run()
+        reprec.assertoutcome(skipped=1)
+
+    def test_parametrize_with_marked_function(self, testdir):
+        testdir.makepyfile("""
+            import pytest
+
+            def func(): pass
+
+            @pytest.mark.parametrize('a', [pytest.mark.xfail(func)])
+            def test_function(a):
+                assert False
+        """)
+        reprec = testdir.inline_run()
+        reprec.assertoutcome(skipped=1)
+
 
 class TestSorting:
     def test_check_equality(self, testdir):