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

Author: dariomesic

src/_pytest/raises.py

@@ -704,10 +704,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__!r}")
+            else:
+                names = ", ".join(f"{x.__name__!r}" 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

@@ -194,15 +194,15 @@ def test_no_raise_message(self) -> None:
         try:
             pytest.raises(ValueError, int, "0")
         except pytest.fail.Exception as e:
-            assert e.msg == f"DID NOT RAISE {ValueError!r}"
+            assert e.msg == f"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 == f"DID NOT RAISE 'ValueError'"
         else:
             assert False, "Expected pytest.raises.Exception"
 
@@ -333,7 +333,7 @@ class ClassLooksIterableException(Exception, metaclass=Meta):
 
         with pytest.raises(
             Failed,
-            match=r"DID NOT RAISE <class 'raises(\..*)*ClassLooksIterableException'>",
+            match=r"DID NOT RAISE 'ClassLooksIterableException'",
         ):
             pytest.raises(ClassLooksIterableException, lambda: None)
 

testing/python/raises_group.py

@@ -1099,7 +1099,7 @@ def test_raisesexc() -> None:
 
     # 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):
             ...
 
@@ -1111,7 +1111,7 @@ def test_raisesexc() -> None:
         # FIXME: do we want repr(type) or type.__name__ ?
         Failed,
         match=wrap_escape(
-            "DID NOT RAISE any of (<class 'ValueError'>, <class 'TypeError'>)"
+            "DID NOT RAISE any of ('ValueError', 'TypeError')"
         ),
     ):
         with RaisesExc((ValueError, TypeError)):