Skip to content

Commit 60c4e8b

Browse files
committed
gh-138013: Remove load_tests in test_io.test_general
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 d0c9943 commit 60c4e8b

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
@@ -356,7 +356,7 @@ def __getattr__(self, name):
356356
return getattr(pyio, name)
357357

358358

359-
class IOTest(unittest.TestCase):
359+
class IOTest:
360360

361361
def setUp(self):
362362
os_helper.unlink(os_helper.TESTFN)
@@ -2842,7 +2842,7 @@ def test_decoder(self):
28422842
self.assertEqual(d.decode(b'oiabcd'), '')
28432843
self.assertEqual(d.decode(b'', 1), 'abcd.')
28442844

2845-
class TextIOWrapperTest(unittest.TestCase):
2845+
class TextIOWrapperTest:
28462846

28472847
def setUp(self):
28482848
self.testdata = b"AAA\r\nBBB\rCCC\r\nDDD\nEEE\r\n"
@@ -4200,7 +4200,7 @@ class PyTextIOWrapperTest(TextIOWrapperTest, PyTestCase):
42004200
shutdown_error = "LookupError: unknown encoding: ascii"
42014201

42024202

4203-
class IncrementalNewlineDecoderTest(unittest.TestCase):
4203+
class IncrementalNewlineDecoderTest:
42044204

42054205
def check_newline_decoding_utf8(self, decoder):
42064206
# UTF-8 specific tests for a newline decoder
@@ -4317,7 +4317,7 @@ def test_translate(self):
43174317
decoder = self.IncrementalNewlineDecoder(decoder, translate=0)
43184318
self.assertEqual(decoder.decode(b"\r\r\n"), "\r\r\n")
43194319

4320-
class CIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest):
4320+
class CIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest, unittest.TestCase):
43214321
IncrementalNewlineDecoder = io.IncrementalNewlineDecoder
43224322

43234323
@support.cpython_only
@@ -4330,13 +4330,13 @@ def test_uninitialized(self):
43304330
self.assertRaises(ValueError, uninitialized.reset)
43314331

43324332

4333-
class PyIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest):
4333+
class PyIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest, unittest.TestCase):
43344334
IncrementalNewlineDecoder = pyio.IncrementalNewlineDecoder
43354335

43364336

43374337
# XXX Tests for open()
43384338

4339-
class MiscIOTest(unittest.TestCase):
4339+
class MiscIOTest:
43404340

43414341
# for test__all__, actual values are set in subclasses
43424342
name_of_module = None
@@ -4772,7 +4772,7 @@ class PyMiscIOTest(MiscIOTest, PyTestCase):
47724772

47734773

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

47774777
def setUp(self):
47784778
self.oldalrm = signal.signal(signal.SIGALRM, self.alarm_interrupt)
@@ -5056,24 +5056,5 @@ def test_writer_subclass(self):
50565056
self.assertNotIsSubclass(str, io.Writer)
50575057

50585058

5059-
def load_tests(loader, tests, pattern):
5060-
tests = (CIOTest, PyIOTest, APIMismatchTest,
5061-
CBufferedReaderTest, PyBufferedReaderTest,
5062-
CBufferedWriterTest, PyBufferedWriterTest,
5063-
CBufferedRWPairTest, PyBufferedRWPairTest,
5064-
CBufferedRandomTest, PyBufferedRandomTest,
5065-
StatefulIncrementalDecoderTest,
5066-
CIncrementalNewlineDecoderTest, PyIncrementalNewlineDecoderTest,
5067-
CTextIOWrapperTest, PyTextIOWrapperTest,
5068-
CMiscIOTest, PyMiscIOTest,
5069-
CSignalsTest, PySignalsTest, TestIOCTypes,
5070-
ProtocolsTest,
5071-
)
5072-
5073-
suite = loader.suiteClass()
5074-
for test in tests:
5075-
suite.addTest(loader.loadTestsFromTestCase(test))
5076-
return suite
5077-
50785059
if __name__ == "__main__":
50795060
unittest.main()

0 commit comments

Comments
 (0)