Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 7 additions & 26 deletions Lib/test/test_io/test_general.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Loading