summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-01-10 04:11:34 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-01-10 04:11:34 (GMT)
commitb21af554ee4d8cc8d6fdc81fb77b38e812f97a4d (patch)
tree35138fbe445eb40d3742cba5624fbfedfd780138 /Lib
parent1d3e96dbe213d359b9d0af5cfdc9bc06b6638c5f (diff)
downloadcpython-b21af554ee4d8cc8d6fdc81fb77b38e812f97a4d.zip
cpython-b21af554ee4d8cc8d6fdc81fb77b38e812f97a4d.tar.gz
cpython-b21af554ee4d8cc8d6fdc81fb77b38e812f97a4d.tar.bz2
#16898: test_bufio now works with unittest test discovery. Patch by Zachary Ware.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_bufio.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/Lib/test/test_bufio.py b/Lib/test/test_bufio.py
index 5ab6f5a..6338ad8 100644
--- a/Lib/test/test_bufio.py
+++ b/Lib/test/test_bufio.py
@@ -11,7 +11,7 @@ import _pyio as pyio # Python implementation.
lengths = list(range(1, 257)) + [512, 1000, 1024, 2048, 4096, 8192, 10000,
16384, 32768, 65536, 1000000]
-class BufferSizeTest(unittest.TestCase):
+class BufferSizeTest:
def try_one(self, s):
# Write s + "\n" + s to file, then open it and ensure that successive
# .readline()s deliver what we wrote.
@@ -62,15 +62,12 @@ class BufferSizeTest(unittest.TestCase):
self.drive_one(bytes(1000))
-class CBufferSizeTest(BufferSizeTest):
+class CBufferSizeTest(BufferSizeTest, unittest.TestCase):
open = io.open
-class PyBufferSizeTest(BufferSizeTest):
+class PyBufferSizeTest(BufferSizeTest, unittest.TestCase):
open = staticmethod(pyio.open)
-def test_main():
- support.run_unittest(CBufferSizeTest, PyBufferSizeTest)
-
if __name__ == "__main__":
- test_main()
+ unittest.main()