add re_emit keyword

Author: reaganjlee

src/_pytest/recwarn.py

@@ -108,6 +108,7 @@ def warns(  # noqa: F811
     expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]] = Warning,
     *args: Any,
     match: Optional[Union[str, Pattern[str]]] = None,
+    re_emit: bool = False,
     **kwargs: Any,
 ) -> Union["WarningsChecker", Any]:
     r"""Assert that code raises a particular class of warning.
@@ -158,12 +159,14 @@ def warns(  # noqa: F811
                 f"Unexpected keyword arguments passed to pytest.warns: {argnames}"
                 "\nUse context-manager form instead?"
             )
-        return WarningsChecker(expected_warning, match_expr=match, _ispytest=True)
+        return WarningsChecker(
+            expected_warning, match_expr=match, _ispytest=True, re_emit=re_emit
+        )
     else:
         func = args[0]
         if not callable(func):
             raise TypeError(f"{func!r} object (type: {type(func)}) must be callable")
-        with WarningsChecker(expected_warning, _ispytest=True):
+        with WarningsChecker(expected_warning, _ispytest=True, re_emit=re_emit):
             return func(*args[1:], **kwargs)
 
 
@@ -256,6 +259,7 @@ def __init__(
         match_expr: Optional[Union[str, Pattern[str]]] = None,
         *,
         _ispytest: bool = False,
+        re_emit: bool = False,
     ) -> None:
         check_ispytest(_ispytest)
         super().__init__(_ispytest=True)
@@ -276,6 +280,7 @@ def __init__(
 
         self.expected_warning = expected_warning_tup
         self.match_expr = match_expr
+        self.re_emit = re_emit
 
     def __exit__(
         self,
@@ -318,7 +323,8 @@ def re_emit(remove=None):
                     for r in self:
                         if issubclass(r.category, self.expected_warning):
                             if re.compile(self.match_expr).search(str(r.message)):
-                                re_emit(r)
+                                if self.re_emit:
+                                    re_emit(r)
                                 break
                     else:
                         fail(
@@ -328,4 +334,5 @@ def re_emit(remove=None):
  Emitted warnings: {found_str()}"""
                         )
                 else:
-                    re_emit()
+                    if self.re_emit:
+                        re_emit()

testing/test_recwarn.py

@@ -406,12 +406,12 @@ def test_warns_context_manager_with_kwargs(self) -> None:
 
     def test_reemit_no_match(self) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.warns(UserWarning):
+            with pytest.warns(UserWarning, re_emit=True):
                 warnings.warn("my warning", UserWarning)
                 warnings.warn("some deprecation warning", DeprecationWarning)
 
     def test_reemit_with_match(self) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.warns(UserWarning, match="my warning"):
+            with pytest.warns(UserWarning, match="my warning", re_emit=True):
                 warnings.warn("my warning", UserWarning)
                 warnings.warn("some deprecation warning", DeprecationWarning)