#17334: test_index now works with unittest test discovery. Patch by Zachary Ware.

This commit is contained in:
Ezio Melotti 2013-03-02 14:47:07 +02:00
parent 02bf701b25
commit bce9a5d5cd
2 changed files with 11 additions and 21 deletions

View File

@ -56,7 +56,7 @@ class BaseTestCase(unittest.TestCase):
self.assertRaises(TypeError, slice(self.n).indices, 0) self.assertRaises(TypeError, slice(self.n).indices, 0)
class SeqTestCase(unittest.TestCase): class SeqTestCase:
# This test case isn't run directly. It just defines common tests # This test case isn't run directly. It just defines common tests
# to the different sequence types below # to the different sequence types below
def setUp(self): def setUp(self):
@ -126,7 +126,7 @@ class SeqTestCase(unittest.TestCase):
self.assertRaises(TypeError, sliceobj, self.n, self) self.assertRaises(TypeError, sliceobj, self.n, self)
class ListTestCase(SeqTestCase): class ListTestCase(SeqTestCase, unittest.TestCase):
seq = [0,10,20,30,40,50] seq = [0,10,20,30,40,50]
def test_setdelitem(self): def test_setdelitem(self):
@ -182,19 +182,19 @@ class NewSeq:
return self._list[index] return self._list[index]
class TupleTestCase(SeqTestCase): class TupleTestCase(SeqTestCase, unittest.TestCase):
seq = (0,10,20,30,40,50) seq = (0,10,20,30,40,50)
class ByteArrayTestCase(SeqTestCase): class ByteArrayTestCase(SeqTestCase, unittest.TestCase):
seq = bytearray(b"this is a test") seq = bytearray(b"this is a test")
class BytesTestCase(SeqTestCase): class BytesTestCase(SeqTestCase, unittest.TestCase):
seq = b"this is a test" seq = b"this is a test"
class StringTestCase(SeqTestCase): class StringTestCase(SeqTestCase, unittest.TestCase):
seq = "this is a test" seq = "this is a test"
class NewSeqTestCase(SeqTestCase): class NewSeqTestCase(SeqTestCase, unittest.TestCase):
seq = NewSeq((0,10,20,30,40,50)) seq = NewSeq((0,10,20,30,40,50))
@ -237,18 +237,5 @@ class OverflowTestCase(unittest.TestCase):
self.assertRaises(OverflowError, lambda: "a" * self.neg) self.assertRaises(OverflowError, lambda: "a" * self.neg)
def test_main():
support.run_unittest(
BaseTestCase,
ListTestCase,
TupleTestCase,
BytesTestCase,
ByteArrayTestCase,
StringTestCase,
NewSeqTestCase,
RangeTestCase,
OverflowTestCase,
)
if __name__ == "__main__": if __name__ == "__main__":
test_main() unittest.main()

View File

@ -644,6 +644,9 @@ Tests
- Issue #15539: Added regression tests for Tools/scripts/pindent.py. - Issue #15539: Added regression tests for Tools/scripts/pindent.py.
- Issue #17334: test_index now works with unittest test discovery.
Patch by Zachary Ware.
- Issue #17333: test_imaplib now works with unittest test discovery. - Issue #17333: test_imaplib now works with unittest test discovery.
Patch by Zachary Ware. Patch by Zachary Ware.