Skip to content

Commit ed75160

Browse files
authored
gh-138013: Remove load_tests in test_io.test_general (#138771)
Rely on default test discovery. Validation: ```bash # Run before commit ./python -m test test_io -uall,walltime,largefile,cpu,extralargefile -M25G -o --fail-env-changed -j0 --list-cases | sort > old_cases.txt # Run after commit ./python -m test test_io -uall,walltime,largefile,cpu,extralargefile -M25G -o --fail-env-changed -j0 --list-cases | sort > new_cases.txt diff new_cases.txt old_cases. # <outputs no changes in case list> ```
1 parent 90fe325 commit ed75160

File tree

1 file changed

+7
-26
lines changed

1 file changed

+7
-26
lines changed

Lib/test/test_io/test_general.py

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def __index__(self):
4949
1/0
5050

5151

52-
class IOTest(unittest.TestCase):
52+
class IOTest:
5353

5454
def setUp(self):
5555
os_helper.unlink(os_helper.TESTFN)
@@ -2535,7 +2535,7 @@ def test_decoder(self):
25352535
self.assertEqual(d.decode(b'oiabcd'), '')
25362536
self.assertEqual(d.decode(b'', 1), 'abcd.')
25372537

2538-
class TextIOWrapperTest(unittest.TestCase):
2538+
class TextIOWrapperTest:
25392539

25402540
def setUp(self):
25412541
self.testdata = b"AAA\r\nBBB\rCCC\r\nDDD\nEEE\r\n"
@@ -3893,7 +3893,7 @@ class PyTextIOWrapperTest(TextIOWrapperTest, PyTestCase):
38933893
shutdown_error = "LookupError: unknown encoding: ascii"
38943894

38953895

3896-
class IncrementalNewlineDecoderTest(unittest.TestCase):
3896+
class IncrementalNewlineDecoderTest:
38973897

38983898
def check_newline_decoding_utf8(self, decoder):
38993899
# UTF-8 specific tests for a newline decoder
@@ -4010,7 +4010,7 @@ def test_translate(self):
40104010
decoder = self.IncrementalNewlineDecoder(decoder, translate=0)
40114011
self.assertEqual(decoder.decode(b"\r\r\n"), "\r\r\n")
40124012

4013-
class CIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest):
4013+
class CIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest, unittest.TestCase):
40144014
IncrementalNewlineDecoder = io.IncrementalNewlineDecoder
40154015

40164016
@support.cpython_only
@@ -4023,13 +4023,13 @@ def test_uninitialized(self):
40234023
self.assertRaises(ValueError, uninitialized.reset)
40244024

40254025

4026-
class PyIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest):
4026+
class PyIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest, unittest.TestCase):
40274027
IncrementalNewlineDecoder = pyio.IncrementalNewlineDecoder
40284028

40294029

40304030
# XXX Tests for open()
40314031

4032-
class MiscIOTest(unittest.TestCase):
4032+
class MiscIOTest:
40334033

40344034
# for test__all__, actual values are set in subclasses
40354035
name_of_module = None
@@ -4465,7 +4465,7 @@ class PyMiscIOTest(MiscIOTest, PyTestCase):
44654465

44664466

44674467
@unittest.skipIf(os.name == 'nt', 'POSIX signals required for this test.')
4468-
class SignalsTest(unittest.TestCase):
4468+
class SignalsTest:
44694469

44704470
def setUp(self):
44714471
self.oldalrm = signal.signal(signal.SIGALRM, self.alarm_interrupt)
@@ -4749,24 +4749,5 @@ def test_writer_subclass(self):
47494749
self.assertNotIsSubclass(str, io.Writer)
47504750

47514751

4752-
def load_tests(loader, tests, pattern):
4753-
tests = (CIOTest, PyIOTest, APIMismatchTest,
4754-
CBufferedReaderTest, PyBufferedReaderTest,
4755-
CBufferedWriterTest, PyBufferedWriterTest,
4756-
CBufferedRWPairTest, PyBufferedRWPairTest,
4757-
CBufferedRandomTest, PyBufferedRandomTest,
4758-
StatefulIncrementalDecoderTest,
4759-
CIncrementalNewlineDecoderTest, PyIncrementalNewlineDecoderTest,
4760-
CTextIOWrapperTest, PyTextIOWrapperTest,
4761-
CMiscIOTest, PyMiscIOTest,
4762-
CSignalsTest, PySignalsTest, TestIOCTypes,
4763-
ProtocolsTest,
4764-
)
4765-
4766-
suite = loader.suiteClass()
4767-
for test in tests:
4768-
suite.addTest(loader.loadTestsFromTestCase(test))
4769-
return suite
4770-
47714752
if __name__ == "__main__":
47724753
unittest.main()

0 commit comments

Comments
 (0)