Handle match with pytest.raises()

Fixes pytest-dev#6752.

Author: blueyed

changelog/6752.bugfix.rst

@@ -0,0 +1 @@
+Handle ``match`` with :py:func:`pytest.raises` used as a function.

src/_pytest/python_api.py

@@ -710,6 +710,15 @@ def raises(  # noqa: F811
         except expected_exception as e:
             # We just caught the exception - there is a traceback.
             assert e.__traceback__ is not None
+            if match:
+                excinfo = _pytest._code.ExceptionInfo.from_exc_info(
+                    (type(e), e, e.__traceback__)
+                )
+                excinfo.match(match)
+                try:
+                    return excinfo
+                finally:
+                    del excinfo
             return _pytest._code.ExceptionInfo.from_exc_info(
                 (type(e), e, e.__traceback__)
             )

testing/python/raises.py

@@ -1,3 +1,4 @@
+import re
 import sys
 
 import pytest
@@ -154,7 +155,7 @@ def test_no_raise_message(self):
         else:
             assert False, "Expected pytest.raises.Exception"
 
-    @pytest.mark.parametrize("method", ["function", "with"])
+    @pytest.mark.parametrize("method", ["function", "function_match", "with"])
     def test_raises_cyclic_reference(self, method):
         """
         Ensure pytest.raises does not leave a reference cycle (#1965).
@@ -175,6 +176,8 @@ def __call__(self):
 
         if method == "function":
             pytest.raises(ValueError, t)
+        elif method == "function_match":
+            pytest.raises(ValueError, t, match="^$")
         else:
             with pytest.raises(ValueError):
                 t()
@@ -194,13 +197,19 @@ def test_raises_match(self):
             int("asdf")
 
         msg = "with base 16"
-        expr = r"Pattern '{}' does not match \"invalid literal for int\(\) with base 10: 'asdf'\"".format(
+        expr = "Pattern {!r} does not match \"invalid literal for int() with base 10: 'asdf'\"".format(
             msg
         )
-        with pytest.raises(AssertionError, match=expr):
+        with pytest.raises(AssertionError, match=re.escape(expr)):
             with pytest.raises(ValueError, match=msg):
                 int("asdf", base=10)
 
+        # "match" without context manager.
+        pytest.raises(ValueError, int, "asdf", match="invalid literal")
+        with pytest.raises(AssertionError) as excinfo:
+            pytest.raises(ValueError, int, "asdf", match=msg)
+        assert str(excinfo.value) == expr
+
     def test_match_failure_string_quoting(self):
         with pytest.raises(AssertionError) as excinfo:
             with pytest.raises(AssertionError, match="'foo"):