Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 4419870

Browse filesBrowse files
serhiy-storchakasrinivasreddy
serhiy-storchaka
authored and
srinivasreddy
committed
pythongh-71339: Use new assertion methods in test_capi (pythonGH-129053)
1 parent 36ff53f commit 4419870
Copy full SHA for 4419870

File tree

Expand file treeCollapse file tree

3 files changed

+18
-18
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+18
-18
lines changed

‎Lib/test/test_capi/test_abstract.py

Copy file name to clipboardExpand all lines: Lib/test/test_capi/test_abstract.py
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def test_object_setattr(self):
274274

275275
# PyObject_SetAttr(obj, attr_name, NULL) removes the attribute
276276
xsetattr(obj, 'a', NULL)
277-
self.assertFalse(hasattr(obj, 'a'))
277+
self.assertNotHasAttr(obj, 'a')
278278
self.assertRaises(AttributeError, xsetattr, obj, 'b', NULL)
279279
self.assertRaises(RuntimeError, xsetattr, obj, 'evil', NULL)
280280

@@ -294,7 +294,7 @@ def test_object_setattrstring(self):
294294

295295
# PyObject_SetAttrString(obj, attr_name, NULL) removes the attribute
296296
setattrstring(obj, b'a', NULL)
297-
self.assertFalse(hasattr(obj, 'a'))
297+
self.assertNotHasAttr(obj, 'a')
298298
self.assertRaises(AttributeError, setattrstring, obj, b'b', NULL)
299299
self.assertRaises(RuntimeError, setattrstring, obj, b'evil', NULL)
300300

@@ -311,10 +311,10 @@ def test_object_delattr(self):
311311
obj.a = 1
312312
setattr(obj, '\U0001f40d', 2)
313313
xdelattr(obj, 'a')
314-
self.assertFalse(hasattr(obj, 'a'))
314+
self.assertNotHasAttr(obj, 'a')
315315
self.assertRaises(AttributeError, xdelattr, obj, 'b')
316316
xdelattr(obj, '\U0001f40d')
317-
self.assertFalse(hasattr(obj, '\U0001f40d'))
317+
self.assertNotHasAttr(obj, '\U0001f40d')
318318

319319
self.assertRaises(AttributeError, xdelattr, 42, 'numerator')
320320
self.assertRaises(RuntimeError, xdelattr, obj, 'evil')
@@ -328,10 +328,10 @@ def test_object_delattrstring(self):
328328
obj.a = 1
329329
setattr(obj, '\U0001f40d', 2)
330330
delattrstring(obj, b'a')
331-
self.assertFalse(hasattr(obj, 'a'))
331+
self.assertNotHasAttr(obj, 'a')
332332
self.assertRaises(AttributeError, delattrstring, obj, b'b')
333333
delattrstring(obj, '\U0001f40d'.encode())
334-
self.assertFalse(hasattr(obj, '\U0001f40d'))
334+
self.assertNotHasAttr(obj, '\U0001f40d')
335335

336336
self.assertRaises(AttributeError, delattrstring, 42, b'numerator')
337337
self.assertRaises(RuntimeError, delattrstring, obj, b'evil')

‎Lib/test/test_capi/test_misc.py

Copy file name to clipboardExpand all lines: Lib/test/test_capi/test_misc.py
+10-10Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ def test_no_FatalError_infinite_loop(self):
116116
"after Python initialization and before Python finalization, "
117117
"but it was called without an active thread state. "
118118
"Are you trying to call the C API inside of a Py_BEGIN_ALLOW_THREADS block?").encode()
119-
self.assertTrue(err.rstrip().startswith(msg),
120-
err)
119+
self.assertStartsWith(err.rstrip(), msg)
121120

122121
def test_memoryview_from_NULL_pointer(self):
123122
self.assertRaises(ValueError, _testcapi.make_memoryview_from_NULL_pointer)
@@ -720,7 +719,7 @@ def test_heaptype_with_setattro(self):
720719

721720
def test_heaptype_with_custom_metaclass(self):
722721
metaclass = _testcapi.HeapCTypeMetaclass
723-
self.assertTrue(issubclass(metaclass, type))
722+
self.assertIsSubclass(metaclass, type)
724723

725724
# Class creation from C
726725
t = _testcapi.pytype_fromspec_meta(metaclass)
@@ -736,7 +735,7 @@ def test_heaptype_with_custom_metaclass(self):
736735
def test_heaptype_with_custom_metaclass_null_new(self):
737736
metaclass = _testcapi.HeapCTypeMetaclassNullNew
738737

739-
self.assertTrue(issubclass(metaclass, type))
738+
self.assertIsSubclass(metaclass, type)
740739

741740
# Class creation from C
742741
t = _testcapi.pytype_fromspec_meta(metaclass)
@@ -751,7 +750,7 @@ def test_heaptype_with_custom_metaclass_null_new(self):
751750
def test_heaptype_with_custom_metaclass_custom_new(self):
752751
metaclass = _testcapi.HeapCTypeMetaclassCustomNew
753752

754-
self.assertTrue(issubclass(_testcapi.HeapCTypeMetaclassCustomNew, type))
753+
self.assertIsSubclass(_testcapi.HeapCTypeMetaclassCustomNew, type)
755754

756755
msg = "Metaclasses with custom tp_new are not supported."
757756
with self.assertRaisesRegex(TypeError, msg):
@@ -910,8 +909,7 @@ def test_export_symbols(self):
910909
names.append('Py_FrozenMain')
911910

912911
for name in names:
913-
with self.subTest(name=name):
914-
self.assertTrue(hasattr(ctypes.pythonapi, name))
912+
self.assertHasAttr(ctypes.pythonapi, name)
915913

916914
def test_clear_managed_dict(self):
917915

@@ -1503,7 +1501,8 @@ def inner(arg5, arg6):
15031501
self.assertIsInstance(closure, tuple)
15041502
self.assertEqual(len(closure), 1)
15051503
self.assertEqual(len(closure), len(func.__code__.co_freevars))
1506-
self.assertTrue(all(isinstance(cell, CellType) for cell in closure))
1504+
for cell in closure:
1505+
self.assertIsInstance(cell, CellType)
15071506
self.assertTrue(closure[0].cell_contents, 5)
15081507

15091508
func = with_two_levels(1, 2)(3, 4)
@@ -1512,7 +1511,8 @@ def inner(arg5, arg6):
15121511
self.assertIsInstance(closure, tuple)
15131512
self.assertEqual(len(closure), 4)
15141513
self.assertEqual(len(closure), len(func.__code__.co_freevars))
1515-
self.assertTrue(all(isinstance(cell, CellType) for cell in closure))
1514+
for cell in closure:
1515+
self.assertIsInstance(cell, CellType)
15161516
self.assertEqual([cell.cell_contents for cell in closure],
15171517
[1, 2, 3, 4])
15181518

@@ -2365,7 +2365,7 @@ def test_mutate_exception(self):
23652365

23662366
support.run_in_subinterp("import binascii; binascii.Error.foobar = 'foobar'")
23672367

2368-
self.assertFalse(hasattr(binascii.Error, "foobar"))
2368+
self.assertNotHasAttr(binascii.Error, "foobar")
23692369

23702370
@unittest.skipIf(_testmultiphase is None, "test requires _testmultiphase module")
23712371
# gh-117649: The free-threaded build does not currently support sharing

‎Lib/test/test_capi/test_sys.py

Copy file name to clipboardExpand all lines: Lib/test/test_capi/test_sys.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_sys_setobject(self):
5151
self.assertEqual(setobject(b'newattr', value2), 0)
5252
self.assertIs(sys.newattr, value2)
5353
self.assertEqual(setobject(b'newattr', NULL), 0)
54-
self.assertFalse(hasattr(sys, 'newattr'))
54+
self.assertNotHasAttr(sys, 'newattr')
5555
self.assertEqual(setobject(b'newattr', NULL), 0)
5656
finally:
5757
with contextlib.suppress(AttributeError):
@@ -60,7 +60,7 @@ def test_sys_setobject(self):
6060
self.assertEqual(setobject('\U0001f40d'.encode(), value), 0)
6161
self.assertIs(getattr(sys, '\U0001f40d'), value)
6262
self.assertEqual(setobject('\U0001f40d'.encode(), NULL), 0)
63-
self.assertFalse(hasattr(sys, '\U0001f40d'))
63+
self.assertNotHasAttr(sys, '\U0001f40d')
6464
finally:
6565
with contextlib.suppress(AttributeError):
6666
delattr(sys, '\U0001f40d')

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.