add AbstractMatcher support to xfail

Author: jakkdl

src/_pytest/mark/structures.py

@@ -23,6 +23,7 @@
 from .._code import getfslineno
 from ..compat import NOTSET
 from ..compat import NotSetType
+from _pytest._raises_group import AbstractMatcher
 from _pytest.config import Config
 from _pytest.deprecated import check_ispytest
 from _pytest.deprecated import MARKED_FIXTURE
@@ -459,7 +460,10 @@ def __call__(
             *conditions: str | bool,
             reason: str = ...,
             run: bool = ...,
-            raises: None | type[BaseException] | tuple[type[BaseException], ...] = ...,
+            raises: None
+            | type[BaseException]
+            | tuple[type[BaseException], ...]
+            | AbstractMatcher[BaseException] = ...,
             strict: bool = ...,
         ) -> MarkDecorator: ...
 

src/_pytest/skipping.py

@@ -12,6 +12,7 @@
 import traceback
 from typing import Optional
 
+from _pytest._raises_group import AbstractMatcher
 from _pytest.config import Config
 from _pytest.config import hookimpl
 from _pytest.config.argparsing import Parser
@@ -201,7 +202,12 @@ class Xfail:
     reason: str
     run: bool
     strict: bool
-    raises: tuple[type[BaseException], ...] | None
+    raises: (
+        type[BaseException]
+        | tuple[type[BaseException], ...]
+        | AbstractMatcher[BaseException]
+        | None
+    )
 
 
 def evaluate_xfail_marks(item: Item) -> Xfail | None:
@@ -277,11 +283,20 @@ def pytest_runtest_makereport(
     elif not rep.skipped and xfailed:
         if call.excinfo:
             raises = xfailed.raises
-            if raises is not None and not isinstance(call.excinfo.value, raises):
-                rep.outcome = "failed"
-            else:
+            if raises is None or (
+                (
+                    isinstance(raises, (type, tuple))
+                    and isinstance(call.excinfo.value, raises)
+                )
+                or (
+                    isinstance(raises, AbstractMatcher)
+                    and raises.matches(call.excinfo.value)
+                )
+            ):
                 rep.outcome = "skipped"
                 rep.wasxfail = xfailed.reason
+            else:
+                rep.outcome = "failed"
         elif call.when == "call":
             if xfailed.strict:
                 rep.outcome = "failed"

testing/python/raises_group.py

@@ -11,6 +11,7 @@
 from _pytest._raises_group import RaisesGroup
 from _pytest._raises_group import repr_callable
 from _pytest.outcomes import Failed
+from _pytest.pytester import Pytester
 import pytest
 
 
@@ -1135,3 +1136,30 @@ def test_assert_matches() -> None:
 
     # but even if we add assert_matches, will people remember to use it?
     # other than writing a linter rule, I don't think we can catch `assert Matcher(...).matches`
+
+
+# https://github.com/pytest-dev/pytest/issues/12504
+def test_xfail_raisesgroup(pytester: Pytester) -> None:
+    pytester.makepyfile(
+        """
+        import pytest
+        @pytest.mark.xfail(raises=pytest.RaisesGroup(ValueError))
+        def test_foo() -> None:
+            raise ExceptionGroup("foo", [ValueError()])
+        """
+    )
+    result = pytester.runpytest()
+    result.assert_outcomes(xfailed=1)
+
+
+def test_xfail_Matcher(pytester: Pytester) -> None:
+    pytester.makepyfile(
+        """
+        import pytest
+        @pytest.mark.xfail(raises=pytest.Matcher(ValueError))
+        def test_foo() -> None:
+            raise ValueError
+        """
+    )
+    result = pytester.runpytest()
+    result.assert_outcomes(xfailed=1)