From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 10 Jan 2013 04:11:34 +0000 (+0200)
Subject: #16898: test_bufio now works with unittest test discovery.  Patch by Zachary Ware.
X-Git-Tag: v3.3.1rc1~401
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b21af554ee4d8cc8d6fdc81fb77b38e812f97a4d;p=thirdparty%2FPython%2Fcpython.git

#16898: test_bufio now works with unittest test discovery.  Patch by Zachary Ware.
---

diff --git a/Lib/test/test_bufio.py b/Lib/test/test_bufio.py
index 5ab6f5a0da4d..6338ad8e3c44 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()
diff --git a/Misc/NEWS b/Misc/NEWS
index 99cb90ddb084..f1e39aeb7e1d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -408,6 +408,9 @@ Library
 Tests
 -----
 
+- Issue #16898: test_bufio now works with unittest test discovery.
+  Patch by Zachary Ware.
+
 - Issue #16888: test_array now works with unittest test discovery.
   Patch by Zachary Ware.