bpo-46299: improve test_descr.py with stricter error handling (GH-30471)

sobolevn · web-flow · commit e63066cfed27 · 2022-01-08T12:51:51.000+09:00
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
@@ -2545,10 +2545,8 @@ def getdict(self):
         m2instance.b = 2
         m2instance.a = 1
         self.assertEqual(m2instance.__dict__, "Not a dict!")
-        try:
+        with self.assertRaises(TypeError):
             dir(m2instance)
-        except TypeError:
-            pass
 
         # Two essentially featureless objects, (Ellipsis just inherits stuff
         # from object.
@@ -4066,7 +4064,7 @@ class D(C):
         except TypeError:
             pass
         else:
-            assert 0, "best_base calculation found wanting"
+            self.fail("best_base calculation found wanting")
 
     def test_unsubclassable_types(self):
         with self.assertRaises(TypeError):
@@ -4452,6 +4450,8 @@ def __getattr__(self, attr):
             print("Oops!")
         except RuntimeError:
             pass
+        else:
+            self.fail("Didn't raise RuntimeError")
         finally:
             sys.stdout = test_stdout
 
