Style: Use type.__name__ in raises error messages for consistency (#13862)

* Style: Use type.__name__ in raises error messages for consistency

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update src/_pytest/raises.py

Co-authored-by: Florian Bruhin <me@the-compiler.org>

* Apply suggestions from code review

remove the fixed FIXME comments

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: John Litborn <11260241+jakkdl@users.noreply.github.com>
Co-authored-by: Florian Bruhin <me@the-compiler.org>

Author: 4 people

changelog/13862.improvement.rst

@@ -0,0 +1 @@
+Improved the readability of "DID NOT RAISE" error messages by using the exception type's name instead of its `repr`.

src/_pytest/raises.py

@@ -685,10 +685,11 @@ def __exit__(
         if exc_type is None:
             if not self.expected_exceptions:
                 fail("DID NOT RAISE any exception")
-            if len(self.expected_exceptions) > 1:
-                fail(f"DID NOT RAISE any of {self.expected_exceptions!r}")
-
-            fail(f"DID NOT RAISE {self.expected_exceptions[0]!r}")
+            if len(self.expected_exceptions) == 1:
+                fail(f"DID NOT RAISE {self.expected_exceptions[0].__name__}")
+            else:
+                names = ", ".join(x.__name__ for x in self.expected_exceptions)
+                fail(f"DID NOT RAISE any of ({names})")
 
         assert self.excinfo is not None, (
             "Internal error - should have been constructed in __enter__"

testing/python/raises.py

@@ -198,15 +198,15 @@ def test_no_raise_message(self) -> None:
             with pytest.raises(ValueError):
                 int("0")
         except pytest.fail.Exception as e:
-            assert e.msg == f"DID NOT RAISE {ValueError!r}"
+            assert e.msg == "DID NOT RAISE ValueError"
         else:
             assert False, "Expected pytest.raises.Exception"
 
         try:
             with pytest.raises(ValueError):
                 pass
         except pytest.fail.Exception as e:
-            assert e.msg == f"DID NOT RAISE {ValueError!r}"
+            assert e.msg == "DID NOT RAISE ValueError"
         else:
             assert False, "Expected pytest.raises.Exception"
 
@@ -337,7 +337,7 @@ class ClassLooksIterableException(Exception, metaclass=Meta):
 
         with pytest.raises(
             Failed,
-            match=r"DID NOT RAISE <class 'raises(\..*)*ClassLooksIterableException'>",
+            match=r"DID NOT RAISE ClassLooksIterableException",
         ):
             with pytest.raises(ClassLooksIterableException):
                 ...  # pragma: no cover

testing/python/raises_group.py

@@ -1094,9 +1094,7 @@ def test_raisesexc() -> None:
     with RaisesExc(ValueError):
         raise ValueError
 
-    # FIXME: leaving this one formatted differently for now to not change
-    # tests in python/raises.py
-    with pytest.raises(Failed, match=wrap_escape("DID NOT RAISE <class 'ValueError'>")):
+    with pytest.raises(Failed, match=wrap_escape("DID NOT RAISE ValueError")):
         with RaisesExc(ValueError):
             ...
 
@@ -1105,11 +1103,8 @@ def test_raisesexc() -> None:
             ...
 
     with pytest.raises(
-        # FIXME: do we want repr(type) or type.__name__ ?
         Failed,
-        match=wrap_escape(
-            "DID NOT RAISE any of (<class 'ValueError'>, <class 'TypeError'>)"
-        ),
+        match=wrap_escape("DID NOT RAISE any of (ValueError, TypeError)"),
     ):
         with RaisesExc((ValueError, TypeError)):
             ...