From 60c4e8b9868421887a3cc02442173463247e0d05 Mon Sep 17 00:00:00 2001 From: Cody Maloney Date: Wed, 10 Sep 2025 16:05:19 -0700 Subject: [PATCH] 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. # ``` --- Lib/test/test_io/test_general.py | 33 +++++++------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/Lib/test/test_io/test_general.py b/Lib/test/test_io/test_general.py index 604b56cea21fac..67f1f6bc0d67c5 100644 --- a/Lib/test/test_io/test_general.py +++ b/Lib/test/test_io/test_general.py @@ -356,7 +356,7 @@ def __getattr__(self, name): return getattr(pyio, name) -class IOTest(unittest.TestCase): +class IOTest: def setUp(self): os_helper.unlink(os_helper.TESTFN) @@ -2842,7 +2842,7 @@ def test_decoder(self): self.assertEqual(d.decode(b'oiabcd'), '') self.assertEqual(d.decode(b'', 1), 'abcd.') -class TextIOWrapperTest(unittest.TestCase): +class TextIOWrapperTest: def setUp(self): self.testdata = b"AAA\r\nBBB\rCCC\r\nDDD\nEEE\r\n" @@ -4200,7 +4200,7 @@ class PyTextIOWrapperTest(TextIOWrapperTest, PyTestCase): shutdown_error = "LookupError: unknown encoding: ascii" -class IncrementalNewlineDecoderTest(unittest.TestCase): +class IncrementalNewlineDecoderTest: def check_newline_decoding_utf8(self, decoder): # UTF-8 specific tests for a newline decoder @@ -4317,7 +4317,7 @@ def test_translate(self): decoder = self.IncrementalNewlineDecoder(decoder, translate=0) self.assertEqual(decoder.decode(b"\r\r\n"), "\r\r\n") -class CIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest): +class CIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest, unittest.TestCase): IncrementalNewlineDecoder = io.IncrementalNewlineDecoder @support.cpython_only @@ -4330,13 +4330,13 @@ def test_uninitialized(self): self.assertRaises(ValueError, uninitialized.reset) -class PyIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest): +class PyIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest, unittest.TestCase): IncrementalNewlineDecoder = pyio.IncrementalNewlineDecoder # XXX Tests for open() -class MiscIOTest(unittest.TestCase): +class MiscIOTest: # for test__all__, actual values are set in subclasses name_of_module = None @@ -4772,7 +4772,7 @@ class PyMiscIOTest(MiscIOTest, PyTestCase): @unittest.skipIf(os.name == 'nt', 'POSIX signals required for this test.') -class SignalsTest(unittest.TestCase): +class SignalsTest: def setUp(self): self.oldalrm = signal.signal(signal.SIGALRM, self.alarm_interrupt) @@ -5056,24 +5056,5 @@ def test_writer_subclass(self): self.assertNotIsSubclass(str, io.Writer) -def load_tests(loader, tests, pattern): - tests = (CIOTest, PyIOTest, APIMismatchTest, - CBufferedReaderTest, PyBufferedReaderTest, - CBufferedWriterTest, PyBufferedWriterTest, - CBufferedRWPairTest, PyBufferedRWPairTest, - CBufferedRandomTest, PyBufferedRandomTest, - StatefulIncrementalDecoderTest, - CIncrementalNewlineDecoderTest, PyIncrementalNewlineDecoderTest, - CTextIOWrapperTest, PyTextIOWrapperTest, - CMiscIOTest, PyMiscIOTest, - CSignalsTest, PySignalsTest, TestIOCTypes, - ProtocolsTest, - ) - - suite = loader.suiteClass() - for test in tests: - suite.addTest(loader.loadTestsFromTestCase(test)) - return suite - if __name__ == "__main__": unittest.main()