mirror of https://github.com/python/cpython
#16898: merge with 3.3.
This commit is contained in:
commit
09a8e163da
|
@ -11,7 +11,7 @@ import _pyio as pyio # Python implementation.
|
||||||
lengths = list(range(1, 257)) + [512, 1000, 1024, 2048, 4096, 8192, 10000,
|
lengths = list(range(1, 257)) + [512, 1000, 1024, 2048, 4096, 8192, 10000,
|
||||||
16384, 32768, 65536, 1000000]
|
16384, 32768, 65536, 1000000]
|
||||||
|
|
||||||
class BufferSizeTest(unittest.TestCase):
|
class BufferSizeTest:
|
||||||
def try_one(self, s):
|
def try_one(self, s):
|
||||||
# Write s + "\n" + s to file, then open it and ensure that successive
|
# Write s + "\n" + s to file, then open it and ensure that successive
|
||||||
# .readline()s deliver what we wrote.
|
# .readline()s deliver what we wrote.
|
||||||
|
@ -62,15 +62,12 @@ class BufferSizeTest(unittest.TestCase):
|
||||||
self.drive_one(bytes(1000))
|
self.drive_one(bytes(1000))
|
||||||
|
|
||||||
|
|
||||||
class CBufferSizeTest(BufferSizeTest):
|
class CBufferSizeTest(BufferSizeTest, unittest.TestCase):
|
||||||
open = io.open
|
open = io.open
|
||||||
|
|
||||||
class PyBufferSizeTest(BufferSizeTest):
|
class PyBufferSizeTest(BufferSizeTest, unittest.TestCase):
|
||||||
open = staticmethod(pyio.open)
|
open = staticmethod(pyio.open)
|
||||||
|
|
||||||
|
|
||||||
def test_main():
|
|
||||||
support.run_unittest(CBufferSizeTest, PyBufferSizeTest)
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
test_main()
|
unittest.main()
|
||||||
|
|
|
@ -614,6 +614,9 @@ Tests
|
||||||
|
|
||||||
- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
|
- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
|
||||||
|
|
||||||
|
- Issue #16898: test_bufio now works with unittest test discovery.
|
||||||
|
Patch by Zachary Ware.
|
||||||
|
|
||||||
- Issue #16888: test_array now works with unittest test discovery.
|
- Issue #16888: test_array now works with unittest test discovery.
|
||||||
Patch by Zachary Ware.
|
Patch by Zachary Ware.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue