diff options
author | Jim Fasarakis-Hilliard <d.f.hilliard@gmail.com> | 2017-03-27 19:35:52 (GMT) |
---|---|---|
committer | Brett Cannon <brettcannon@users.noreply.github.com> | 2017-03-27 19:35:52 (GMT) |
commit | d702c50049207d825c1d5925fbc7306514fa9a0a (patch) | |
tree | 46ba3a1b68ff939b14c0f1a6dca56a342c7cd42e | |
parent | d6debb24e06152a827769b0cac24c47deccdeac1 (diff) | |
download | cpython-d702c50049207d825c1d5925fbc7306514fa9a0a.zip cpython-d702c50049207d825c1d5925fbc7306514fa9a0a.tar.gz cpython-d702c50049207d825c1d5925fbc7306514fa9a0a.tar.bz2 |
bpo-29912: Remove redundant tests in list_tests that are found in seq_tests (GH-847)
-rw-r--r-- | Lib/test/list_tests.py | 65 | ||||
-rw-r--r-- | Lib/test/seq_tests.py | 2 |
2 files changed, 4 insertions, 63 deletions
diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py index 26e9368..ce9db9a 100644 --- a/Lib/test/list_tests.py +++ b/Lib/test/list_tests.py @@ -354,66 +354,9 @@ class CommonTest(seq_tests.CommonTest): # 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])) @@ -548,11 +491,7 @@ class CommonTest(seq_tests.CommonTest): 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 diff --git a/Lib/test/seq_tests.py b/Lib/test/seq_tests.py index 1e7a6f6..6aedd2b 100644 --- a/Lib/test/seq_tests.py +++ b/Lib/test/seq_tests.py @@ -301,6 +301,8 @@ class CommonTest(unittest.TestCase): 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__ |