traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#17479: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-03-23 16:36:58 +02:00
parent 3213d72c5e daa42c778e
commit e94cbd188b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_io.py
View File

@ -3234,7 +3234,7 @@ class PySignalsTest(SignalsTest):
test_reentrant_write_text = None test_reentrant_write_text = None
def test_main(): def load_tests(*args):
tests = (CIOTest, PyIOTest, tests = (CIOTest, PyIOTest,
CBufferedReaderTest, PyBufferedReaderTest, CBufferedReaderTest, PyBufferedReaderTest,
CBufferedWriterTest, PyBufferedWriterTest, CBufferedWriterTest, PyBufferedWriterTest,
@ -3267,7 +3267,8 @@ def test_main():
for name, obj in py_io_ns.items(): for name, obj in py_io_ns.items():
setattr(test, name, obj) setattr(test, name, obj)
support.run_unittest(*tests) suite = unittest.TestSuite([unittest.makeSuite(test) for test in tests])
return suite
if __name__ == "__main__": if __name__ == "__main__":
test_main() unittest.main()

3
Misc/NEWS
View File

@ -1035,6 +1035,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 #17479: test_io now works with unittest test discovery.
Patch by Zachary Ware.
- Issue #17066: test_robotparser now works with unittest test discovery. - Issue #17066: test_robotparser now works with unittest test discovery.
Patch by Zachary Ware. Patch by Zachary Ware.