https://github.com/python/cpython/commit/38c3cf6320bfc15e6a69f73724a49df5280d8269
commit: 38c3cf6320bfc15e6a69f73724a49df5280d8269
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2025-01-20T13:30:00Z
summary:
gh-71339: Use new assertion methods in test_ctypes (GH-129054)
files:
M Lib/test/test_ctypes/test_c_simple_type_meta.py
M Lib/test/test_ctypes/test_loading.py
M Lib/test/test_ctypes/test_repr.py
diff --git a/Lib/test/test_ctypes/test_c_simple_type_meta.py
b/Lib/test/test_ctypes/test_c_simple_type_meta.py
index eb77d6d7782478..e8f347a0d0c57b 100644
--- a/Lib/test/test_ctypes/test_c_simple_type_meta.py
+++ b/Lib/test/test_ctypes/test_c_simple_type_meta.py
@@ -54,9 +54,9 @@ class Sub2(Sub):
pass
self.assertIsInstance(POINTER(Sub2), p_meta)
- self.assertTrue(issubclass(POINTER(Sub2), Sub2))
- self.assertTrue(issubclass(POINTER(Sub2), POINTER(Sub)))
- self.assertTrue(issubclass(POINTER(Sub), POINTER(CtBase)))
+ self.assertIsSubclass(POINTER(Sub2), Sub2)
+ self.assertIsSubclass(POINTER(Sub2), POINTER(Sub))
+ self.assertIsSubclass(POINTER(Sub), POINTER(CtBase))
def test_creating_pointer_in_dunder_new_2(self):
# A simpler variant of the above, used in `CoClass` of the `comtypes`
@@ -84,7 +84,7 @@ class Sub(CtBase):
pass
self.assertIsInstance(POINTER(Sub), p_meta)
- self.assertTrue(issubclass(POINTER(Sub), Sub))
+ self.assertIsSubclass(POINTER(Sub), Sub)
def test_creating_pointer_in_dunder_init_1(self):
class ct_meta(type):
@@ -120,9 +120,9 @@ class Sub2(Sub):
pass
self.assertIsInstance(POINTER(Sub2), p_meta)
- self.assertTrue(issubclass(POINTER(Sub2), Sub2))
- self.assertTrue(issubclass(POINTER(Sub2), POINTER(Sub)))
- self.assertTrue(issubclass(POINTER(Sub), POINTER(CtBase)))
+ self.assertIsSubclass(POINTER(Sub2), Sub2)
+ self.assertIsSubclass(POINTER(Sub2), POINTER(Sub))
+ self.assertIsSubclass(POINTER(Sub), POINTER(CtBase))
def test_creating_pointer_in_dunder_init_2(self):
class ct_meta(type):
@@ -149,4 +149,4 @@ class Sub(CtBase):
pass
self.assertIsInstance(POINTER(Sub), p_meta)
- self.assertTrue(issubclass(POINTER(Sub), Sub))
+ self.assertIsSubclass(POINTER(Sub), Sub)
diff --git a/Lib/test/test_ctypes/test_loading.py
b/Lib/test/test_ctypes/test_loading.py
index fc1eecb77e17e3..13ed813ad98c31 100644
--- a/Lib/test/test_ctypes/test_loading.py
+++ b/Lib/test/test_ctypes/test_loading.py
@@ -135,7 +135,7 @@ def test_1703286_B(self):
'test specific to Windows')
def test_load_hasattr(self):
# bpo-34816: shouldn't raise OSError
- self.assertFalse(hasattr(ctypes.windll, 'test'))
+ self.assertNotHasAttr(ctypes.windll, 'test')
@unittest.skipUnless(os.name == "nt",
'test specific to Windows')
diff --git a/Lib/test/test_ctypes/test_repr.py
b/Lib/test/test_ctypes/test_repr.py
index e7587984a92c45..8c85e6cbe70cea 100644
--- a/Lib/test/test_ctypes/test_repr.py
+++ b/Lib/test/test_ctypes/test_repr.py
@@ -22,12 +22,12 @@ class ReprTest(unittest.TestCase):
def test_numbers(self):
for typ in subclasses:
base = typ.__bases__[0]
- self.assertTrue(repr(base(42)).startswith(base.__name__))
- self.assertEqual("<X object at", repr(typ(42))[:12])
+ self.assertStartsWith(repr(base(42)), base.__name__)
+ self.assertStartsWith(repr(typ(42)), "<X object at")
def test_char(self):
self.assertEqual("c_char(b'x')", repr(c_char(b'x')))
- self.assertEqual("<X object at", repr(X(b'x'))[:12])
+ self.assertStartsWith(repr(X(b'x')), "<X object at")
if __name__ == "__main__":
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
