Update tests for re-emitted warnings

src/_pytest/recwarn.py

@@ -135,7 +135,8 @@ def warns(  # noqa: F811
         >>> with pytest.warns(UserWarning, match=r'must be \d+$'):
         ...     warnings.warn("value must be 42", UserWarning)
 
-        >>> with pytest.warns(UserWarning, match=r'must be \d+$'):
+        >>> with pytest.warns(UserWarning):  # catch re-emitted warning
+        ...     with pytest.warns(UserWarning, match=r'must be \d+$'):
         ...         warnings.warn("this is not here", UserWarning)
         Traceback (most recent call last):
           ...
@@ -327,7 +328,7 @@ class WarningsChecker(WarningsRecorder):
                 if not self.matches(w):
                     warnings.warn_explicit(
                         str(w.message),
-                        w.message.__class__,
+                        w.message.__class__,  # type: ignore
                         w.filename,
                         w.lineno,
                         module=w.__module__,

testing/test_recwarn.py

@@ -203,6 +203,7 @@ class TestDeprecatedCall:
             def f():
                 warnings.warn(warning("hi"))
 
+            with pytest.warns(warning):
                 with pytest.raises(pytest.fail.Exception):
                     pytest.deprecated_call(f)
                 with pytest.raises(pytest.fail.Exception):
@@ -213,7 +214,8 @@ class TestDeprecatedCall:
         with pytest.deprecated_call(match=r"must be \d+$"):
             warnings.warn("value must be 42", DeprecationWarning)
 
-        with pytest.raises(pytest.fail.Exception):
+        with pytest.deprecated_call():
+            with pytest.raises(pytest.fail.Exception, match="DID NOT WARN"):
                 with pytest.deprecated_call(match=r"must be \d+$"):
                     warnings.warn("this is not here", DeprecationWarning)
 
@@ -227,6 +229,7 @@ class TestWarns:
     def test_several_messages(self) -> None:
         # different messages, b/c Python suppresses multiple identical warnings
         pytest.warns(RuntimeWarning, lambda: warnings.warn("w1", RuntimeWarning))
+        with pytest.warns(RuntimeWarning):
             with pytest.raises(pytest.fail.Exception):
                 pytest.warns(UserWarning, lambda: warnings.warn("w2", RuntimeWarning))
         pytest.warns(RuntimeWarning, lambda: warnings.warn("w3", RuntimeWarning))
@@ -243,6 +246,7 @@ class TestWarns:
         pytest.warns(
             (RuntimeWarning, SyntaxWarning), lambda: warnings.warn("w2", SyntaxWarning)
         )
+        with pytest.warns():
             pytest.raises(
                 pytest.fail.Exception,
                 lambda: pytest.warns(
@@ -258,20 +262,22 @@ class TestWarns:
         with pytest.warns(UserWarning):
             warnings.warn("user", UserWarning)
 
+        with pytest.warns():
             with pytest.raises(pytest.fail.Exception) as excinfo:
                 with pytest.warns(RuntimeWarning):
                     warnings.warn("user", UserWarning)
         excinfo.match(
             r"DID NOT WARN. No warnings of type \(.+RuntimeWarning.+,\) were emitted.\n"
-            r"The list of emitted warnings is: \[UserWarning\('user',?\)\]."
+            r" Emitted warnings: \[UserWarning\('user',?\)\]."
         )
 
+        with pytest.warns():
             with pytest.raises(pytest.fail.Exception) as excinfo:
                 with pytest.warns(UserWarning):
                     warnings.warn("runtime", RuntimeWarning)
         excinfo.match(
             r"DID NOT WARN. No warnings of type \(.+UserWarning.+,\) were emitted.\n"
-            r"The list of emitted warnings is: \[RuntimeWarning\('runtime',?\)]."
+            r" Emitted warnings: \[RuntimeWarning\('runtime',?\)]."
         )
 
         with pytest.raises(pytest.fail.Exception) as excinfo:
@@ -279,10 +285,11 @@ class TestWarns:
                 pass
         excinfo.match(
             r"DID NOT WARN. No warnings of type \(.+UserWarning.+,\) were emitted.\n"
-            r"The list of emitted warnings is: \[\]."
+            r" Emitted warnings: \[\]."
         )
 
         warning_classes = (UserWarning, FutureWarning)
+        with pytest.warns():
             with pytest.raises(pytest.fail.Exception) as excinfo:
                 with pytest.warns(warning_classes) as warninfo:
                     warnings.warn("runtime", RuntimeWarning)
@@ -291,7 +298,7 @@ class TestWarns:
         messages = [each.message for each in warninfo]
         expected_str = (
             f"DID NOT WARN. No warnings of type {warning_classes} were emitted.\n"
-            f"The list of emitted warnings is: {messages}."
+            f" Emitted warnings: {messages}."
         )
 
         assert str(excinfo.value) == expected_str
@@ -367,15 +374,18 @@ class TestWarns:
         with pytest.warns(UserWarning, match=r"must be \d+$"):
             warnings.warn("value must be 42", UserWarning)
 
+        with pytest.warns():
             with pytest.raises(pytest.fail.Exception):
                 with pytest.warns(UserWarning, match=r"must be \d+$"):
                     warnings.warn("this is not here", UserWarning)
 
+        with pytest.warns():
             with pytest.raises(pytest.fail.Exception):
                 with pytest.warns(FutureWarning, match=r"must be \d+$"):
                     warnings.warn("value must be 42", UserWarning)
 
     def test_one_from_multiple_warns(self) -> None:
+        with pytest.warns():
             with pytest.raises(pytest.fail.Exception, match="DID NOT WARN"):
                 with pytest.warns(UserWarning, match=r"aaa"):
                     with pytest.warns(UserWarning, match=r"aaa"):
@@ -384,6 +394,7 @@ class TestWarns:
                         warnings.warn("aaaaaaaaaa", UserWarning)
 
     def test_none_of_multiple_warns(self) -> None:
+        with pytest.warns():
             with pytest.raises(pytest.fail.Exception, match="DID NOT WARN"):
                 with pytest.warns(UserWarning, match=r"aaa"):
                     warnings.warn("bbbbbbbbbb", UserWarning)