Skip to content

Commit d702c50

Browse files
DimitrisJimbrettcannon
authored andcommitted
bpo-29912: Remove redundant tests in list_tests that are found in seq_tests (GH-847)
1 parent d6debb2 commit d702c50

File tree

2 files changed

+4
-63
lines changed

2 files changed

+4
-63
lines changed

Lib/test/list_tests.py

Lines changed: 2 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -354,66 +354,9 @@ def __eq__(self, other):
354354
# verify that original order and values are retained.
355355
self.assertIs(x, y)
356356

357-
def test_count(self):
358-
a = self.type2test([0, 1, 2])*3
359-
self.assertEqual(a.count(0), 3)
360-
self.assertEqual(a.count(1), 3)
361-
self.assertEqual(a.count(3), 0)
362-
363-
self.assertRaises(TypeError, a.count)
364-
365-
class BadExc(Exception):
366-
pass
367-
368-
class BadCmp:
369-
def __eq__(self, other):
370-
if other == 2:
371-
raise BadExc()
372-
return False
373-
374-
self.assertRaises(BadExc, a.count, BadCmp())
375-
376357
def test_index(self):
377-
u = self.type2test([0, 1])
378-
self.assertEqual(u.index(0), 0)
379-
self.assertEqual(u.index(1), 1)
380-
self.assertRaises(ValueError, u.index, 2)
381-
382-
u = self.type2test([-2, -1, 0, 0, 1, 2])
383-
self.assertEqual(u.count(0), 2)
384-
self.assertEqual(u.index(0), 2)
385-
self.assertEqual(u.index(0, 2), 2)
386-
self.assertEqual(u.index(-2, -10), 0)
387-
self.assertEqual(u.index(0, 3), 3)
388-
self.assertEqual(u.index(0, 3, 4), 3)
389-
self.assertRaises(ValueError, u.index, 2, 0, -10)
390-
391-
self.assertRaises(TypeError, u.index)
392-
393-
class BadExc(Exception):
394-
pass
395-
396-
class BadCmp:
397-
def __eq__(self, other):
398-
if other == 2:
399-
raise BadExc()
400-
return False
401-
402-
a = self.type2test([0, 1, 2, 3])
403-
self.assertRaises(BadExc, a.index, BadCmp())
404-
358+
super().test_index()
405359
a = self.type2test([-2, -1, 0, 0, 1, 2])
406-
self.assertEqual(a.index(0), 2)
407-
self.assertEqual(a.index(0, 2), 2)
408-
self.assertEqual(a.index(0, -4), 2)
409-
self.assertEqual(a.index(-2, -10), 0)
410-
self.assertEqual(a.index(0, 3), 3)
411-
self.assertEqual(a.index(0, -3), 3)
412-
self.assertEqual(a.index(0, 3, 4), 3)
413-
self.assertEqual(a.index(0, -3, -2), 3)
414-
self.assertEqual(a.index(0, -4*sys.maxsize, 4*sys.maxsize), 2)
415-
self.assertRaises(ValueError, a.index, 0, 4*sys.maxsize,-4*sys.maxsize)
416-
self.assertRaises(ValueError, a.index, 2, 0, -10)
417360
a.remove(0)
418361
self.assertRaises(ValueError, a.index, 2, 0, 4)
419362
self.assertEqual(a, self.type2test([-2, -1, 0, 1, 2]))
@@ -548,11 +491,7 @@ def test_iadd(self):
548491
self.assertRaises(TypeError, u.__iadd__, None)
549492

550493
def test_imul(self):
551-
u = self.type2test([0, 1])
552-
u *= 3
553-
self.assertEqual(u, self.type2test([0, 1, 0, 1, 0, 1]))
554-
u *= 0
555-
self.assertEqual(u, self.type2test([]))
494+
super().test_imul()
556495
s = self.type2test([])
557496
oldid = id(s)
558497
s *= 10

Lib/test/seq_tests.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,8 @@ def test_imul(self):
301301
u = self.type2test([0, 1])
302302
u *= 3
303303
self.assertEqual(u, self.type2test([0, 1, 0, 1, 0, 1]))
304+
u *= 0
305+
self.assertEqual(u, self.type2test([]))
304306

305307
def test_getitemoverwriteiter(self):
306308
# Verify that __getitem__ overrides are not recognized by __iter__

0 commit comments

Comments
 (0)