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 36aaf41

Browse filesBrowse files
serhiy-storchakaserhiy-storchaka
authored
gh-71339: Use new assertion methods in test_abc (GH-128826)
1 parent da122b5 commit 36aaf41
Copy full SHA for 36aaf41

File tree

Expand file treeCollapse file tree

1 file changed

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

1 file changed

+51
-51
lines changed

‎Lib/test/test_abc.py

Copy file name to clipboardExpand all lines: Lib/test/test_abc.py
+51-51Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_abstractproperty_basics(self):
2020
def foo(self): pass
2121
self.assertTrue(foo.__isabstractmethod__)
2222
def bar(self): pass
23-
self.assertFalse(hasattr(bar, "__isabstractmethod__"))
23+
self.assertNotHasAttr(bar, "__isabstractmethod__")
2424

2525
class C(metaclass=abc_ABCMeta):
2626
@abc.abstractproperty
@@ -89,7 +89,7 @@ def test_abstractmethod_basics(self):
8989
def foo(self): pass
9090
self.assertTrue(foo.__isabstractmethod__)
9191
def bar(self): pass
92-
self.assertFalse(hasattr(bar, "__isabstractmethod__"))
92+
self.assertNotHasAttr(bar, "__isabstractmethod__")
9393

9494
def test_abstractproperty_basics(self):
9595
@property
@@ -276,21 +276,21 @@ class A(metaclass=abc_ABCMeta):
276276
class B(object):
277277
pass
278278
b = B()
279-
self.assertFalse(issubclass(B, A))
280-
self.assertFalse(issubclass(B, (A,)))
279+
self.assertNotIsSubclass(B, A)
280+
self.assertNotIsSubclass(B, (A,))
281281
self.assertNotIsInstance(b, A)
282282
self.assertNotIsInstance(b, (A,))
283283
B1 = A.register(B)
284-
self.assertTrue(issubclass(B, A))
285-
self.assertTrue(issubclass(B, (A,)))
284+
self.assertIsSubclass(B, A)
285+
self.assertIsSubclass(B, (A,))
286286
self.assertIsInstance(b, A)
287287
self.assertIsInstance(b, (A,))
288288
self.assertIs(B1, B)
289289
class C(B):
290290
pass
291291
c = C()
292-
self.assertTrue(issubclass(C, A))
293-
self.assertTrue(issubclass(C, (A,)))
292+
self.assertIsSubclass(C, A)
293+
self.assertIsSubclass(C, (A,))
294294
self.assertIsInstance(c, A)
295295
self.assertIsInstance(c, (A,))
296296

@@ -301,16 +301,16 @@ class A(metaclass=abc_ABCMeta):
301301
class B(object):
302302
pass
303303
b = B()
304-
self.assertTrue(issubclass(B, A))
305-
self.assertTrue(issubclass(B, (A,)))
304+
self.assertIsSubclass(B, A)
305+
self.assertIsSubclass(B, (A,))
306306
self.assertIsInstance(b, A)
307307
self.assertIsInstance(b, (A,))
308308
@A.register
309309
class C(B):
310310
pass
311311
c = C()
312-
self.assertTrue(issubclass(C, A))
313-
self.assertTrue(issubclass(C, (A,)))
312+
self.assertIsSubclass(C, A)
313+
self.assertIsSubclass(C, (A,))
314314
self.assertIsInstance(c, A)
315315
self.assertIsInstance(c, (A,))
316316
self.assertIs(C, A.register(C))
@@ -321,33 +321,33 @@ class A(metaclass=abc_ABCMeta):
321321
class B:
322322
pass
323323
b = B()
324-
self.assertFalse(isinstance(b, A))
325-
self.assertFalse(isinstance(b, (A,)))
324+
self.assertNotIsInstance(b, A)
325+
self.assertNotIsInstance(b, (A,))
326326
token_old = abc_get_cache_token()
327327
A.register(B)
328328
token_new = abc_get_cache_token()
329329
self.assertGreater(token_new, token_old)
330-
self.assertTrue(isinstance(b, A))
331-
self.assertTrue(isinstance(b, (A,)))
330+
self.assertIsInstance(b, A)
331+
self.assertIsInstance(b, (A,))
332332

333333
def test_registration_builtins(self):
334334
class A(metaclass=abc_ABCMeta):
335335
pass
336336
A.register(int)
337337
self.assertIsInstance(42, A)
338338
self.assertIsInstance(42, (A,))
339-
self.assertTrue(issubclass(int, A))
340-
self.assertTrue(issubclass(int, (A,)))
339+
self.assertIsSubclass(int, A)
340+
self.assertIsSubclass(int, (A,))
341341
class B(A):
342342
pass
343343
B.register(str)
344344
class C(str): pass
345345
self.assertIsInstance("", A)
346346
self.assertIsInstance("", (A,))
347-
self.assertTrue(issubclass(str, A))
348-
self.assertTrue(issubclass(str, (A,)))
349-
self.assertTrue(issubclass(C, A))
350-
self.assertTrue(issubclass(C, (A,)))
347+
self.assertIsSubclass(str, A)
348+
self.assertIsSubclass(str, (A,))
349+
self.assertIsSubclass(C, A)
350+
self.assertIsSubclass(C, (A,))
351351

352352
def test_registration_edge_cases(self):
353353
class A(metaclass=abc_ABCMeta):
@@ -375,39 +375,39 @@ class A(metaclass=abc_ABCMeta):
375375
def test_registration_transitiveness(self):
376376
class A(metaclass=abc_ABCMeta):
377377
pass
378-
self.assertTrue(issubclass(A, A))
379-
self.assertTrue(issubclass(A, (A,)))
378+
self.assertIsSubclass(A, A)
379+
self.assertIsSubclass(A, (A,))
380380
class B(metaclass=abc_ABCMeta):
381381
pass
382-
self.assertFalse(issubclass(A, B))
383-
self.assertFalse(issubclass(A, (B,)))
384-
self.assertFalse(issubclass(B, A))
385-
self.assertFalse(issubclass(B, (A,)))
382+
self.assertNotIsSubclass(A, B)
383+
self.assertNotIsSubclass(A, (B,))
384+
self.assertNotIsSubclass(B, A)
385+
self.assertNotIsSubclass(B, (A,))
386386
class C(metaclass=abc_ABCMeta):
387387
pass
388388
A.register(B)
389389
class B1(B):
390390
pass
391-
self.assertTrue(issubclass(B1, A))
392-
self.assertTrue(issubclass(B1, (A,)))
391+
self.assertIsSubclass(B1, A)
392+
self.assertIsSubclass(B1, (A,))
393393
class C1(C):
394394
pass
395395
B1.register(C1)
396-
self.assertFalse(issubclass(C, B))
397-
self.assertFalse(issubclass(C, (B,)))
398-
self.assertFalse(issubclass(C, B1))
399-
self.assertFalse(issubclass(C, (B1,)))
400-
self.assertTrue(issubclass(C1, A))
401-
self.assertTrue(issubclass(C1, (A,)))
402-
self.assertTrue(issubclass(C1, B))
403-
self.assertTrue(issubclass(C1, (B,)))
404-
self.assertTrue(issubclass(C1, B1))
405-
self.assertTrue(issubclass(C1, (B1,)))
396+
self.assertNotIsSubclass(C, B)
397+
self.assertNotIsSubclass(C, (B,))
398+
self.assertNotIsSubclass(C, B1)
399+
self.assertNotIsSubclass(C, (B1,))
400+
self.assertIsSubclass(C1, A)
401+
self.assertIsSubclass(C1, (A,))
402+
self.assertIsSubclass(C1, B)
403+
self.assertIsSubclass(C1, (B,))
404+
self.assertIsSubclass(C1, B1)
405+
self.assertIsSubclass(C1, (B1,))
406406
C1.register(int)
407407
class MyInt(int):
408408
pass
409-
self.assertTrue(issubclass(MyInt, A))
410-
self.assertTrue(issubclass(MyInt, (A,)))
409+
self.assertIsSubclass(MyInt, A)
410+
self.assertIsSubclass(MyInt, (A,))
411411
self.assertIsInstance(42, A)
412412
self.assertIsInstance(42, (A,))
413413

@@ -467,16 +467,16 @@ def __subclasshook__(cls, C):
467467
if cls is A:
468468
return 'foo' in C.__dict__
469469
return NotImplemented
470-
self.assertFalse(issubclass(A, A))
471-
self.assertFalse(issubclass(A, (A,)))
470+
self.assertNotIsSubclass(A, A)
471+
self.assertNotIsSubclass(A, (A,))
472472
class B:
473473
foo = 42
474-
self.assertTrue(issubclass(B, A))
475-
self.assertTrue(issubclass(B, (A,)))
474+
self.assertIsSubclass(B, A)
475+
self.assertIsSubclass(B, (A,))
476476
class C:
477477
spam = 42
478-
self.assertFalse(issubclass(C, A))
479-
self.assertFalse(issubclass(C, (A,)))
478+
self.assertNotIsSubclass(C, A)
479+
self.assertNotIsSubclass(C, (A,))
480480

481481
def test_all_new_methods_are_called(self):
482482
class A(metaclass=abc_ABCMeta):
@@ -493,7 +493,7 @@ class C(A, B):
493493
self.assertEqual(B.counter, 1)
494494

495495
def test_ABC_has___slots__(self):
496-
self.assertTrue(hasattr(abc.ABC, '__slots__'))
496+
self.assertHasAttr(abc.ABC, '__slots__')
497497

498498
def test_tricky_new_works(self):
499499
def with_metaclass(meta, *bases):
@@ -515,7 +515,7 @@ def foo(self):
515515

516516
del A.foo
517517
self.assertEqual(A.__abstractmethods__, {'foo'})
518-
self.assertFalse(hasattr(A, 'foo'))
518+
self.assertNotHasAttr(A, 'foo')
519519

520520
abc.update_abstractmethods(A)
521521

@@ -588,7 +588,7 @@ def updated_foo(self):
588588
A.foo = updated_foo
589589
abc.update_abstractmethods(A)
590590
A()
591-
self.assertFalse(hasattr(A, '__abstractmethods__'))
591+
self.assertNotHasAttr(A, '__abstractmethods__')
592592

593593
def test_update_del_implementation(self):
594594
class A(metaclass=abc_ABCMeta):

0 commit comments

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