Skip to content

bpo-29912: Remove overlapping tests in list_tests and seq_tests #847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2017
Merged

bpo-29912: Remove overlapping tests in list_tests and seq_tests #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 2 additions & 63 deletions Lib/test/list_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,66 +354,9 @@ def __eq__(self, other):
# verify that original order and values are retained.
self.assertIs(x, y)

def test_count(self):
a = self.type2test([0, 1, 2])*3
self.assertEqual(a.count(0), 3)
self.assertEqual(a.count(1), 3)
self.assertEqual(a.count(3), 0)

self.assertRaises(TypeError, a.count)

class BadExc(Exception):
pass

class BadCmp:
def __eq__(self, other):
if other == 2:
raise BadExc()
return False

self.assertRaises(BadExc, a.count, BadCmp())

def test_index(self):
u = self.type2test([0, 1])
self.assertEqual(u.index(0), 0)
self.assertEqual(u.index(1), 1)
self.assertRaises(ValueError, u.index, 2)

u = self.type2test([-2, -1, 0, 0, 1, 2])
self.assertEqual(u.count(0), 2)
self.assertEqual(u.index(0), 2)
self.assertEqual(u.index(0, 2), 2)
self.assertEqual(u.index(-2, -10), 0)
self.assertEqual(u.index(0, 3), 3)
self.assertEqual(u.index(0, 3, 4), 3)
self.assertRaises(ValueError, u.index, 2, 0, -10)

self.assertRaises(TypeError, u.index)

class BadExc(Exception):
pass

class BadCmp:
def __eq__(self, other):
if other == 2:
raise BadExc()
return False

a = self.type2test([0, 1, 2, 3])
self.assertRaises(BadExc, a.index, BadCmp())

super().test_index()
a = self.type2test([-2, -1, 0, 0, 1, 2])
self.assertEqual(a.index(0), 2)
self.assertEqual(a.index(0, 2), 2)
self.assertEqual(a.index(0, -4), 2)
self.assertEqual(a.index(-2, -10), 0)
self.assertEqual(a.index(0, 3), 3)
self.assertEqual(a.index(0, -3), 3)
self.assertEqual(a.index(0, 3, 4), 3)
self.assertEqual(a.index(0, -3, -2), 3)
self.assertEqual(a.index(0, -4*sys.maxsize, 4*sys.maxsize), 2)
self.assertRaises(ValueError, a.index, 0, 4*sys.maxsize,-4*sys.maxsize)
self.assertRaises(ValueError, a.index, 2, 0, -10)
a.remove(0)
self.assertRaises(ValueError, a.index, 2, 0, 4)
self.assertEqual(a, self.type2test([-2, -1, 0, 1, 2]))
Expand Down Expand Up @@ -548,11 +491,7 @@ def test_iadd(self):
self.assertRaises(TypeError, u.__iadd__, None)

def test_imul(self):
u = self.type2test([0, 1])
u *= 3
self.assertEqual(u, self.type2test([0, 1, 0, 1, 0, 1]))
u *= 0
self.assertEqual(u, self.type2test([]))
super().test_imul()
s = self.type2test([])
oldid = id(s)
s *= 10
Expand Down
2 changes: 2 additions & 0 deletions Lib/test/seq_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,8 @@ def test_imul(self):
u = self.type2test([0, 1])
u *= 3
self.assertEqual(u, self.type2test([0, 1, 0, 1, 0, 1]))
u *= 0
self.assertEqual(u, self.type2test([]))

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