diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-23 14:36:58 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-23 14:36:58 (GMT) |
| commit | e94cbd188b8e59fab69e5b6149563d131b50d0c1 (patch) | |
| tree | 4929e2db052a98b2cc1f7fab4cfa6a52955d5e9c | |
| parent | 3213d72c5ef0dfe12d3ae73eebd0e1427d27a046 (diff) | |
| parent | daa42c778e101fa158f89e3a8c5418be5eef90c6 (diff) | |
| download | cpython-e94cbd188b8e59fab69e5b6149563d131b50d0c1.zip cpython-e94cbd188b8e59fab69e5b6149563d131b50d0c1.tar.gz cpython-e94cbd188b8e59fab69e5b6149563d131b50d0c1.tar.bz2 | |
#17479: merge with 3.3.
| -rw-r--r-- | Lib/test/test_io.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index ab9b12e..e5474f0 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -3234,7 +3234,7 @@ class PySignalsTest(SignalsTest): test_reentrant_write_text = None -def test_main(): +def load_tests(*args): tests = (CIOTest, PyIOTest, CBufferedReaderTest, PyBufferedReaderTest, CBufferedWriterTest, PyBufferedWriterTest, @@ -3267,7 +3267,8 @@ def test_main(): for name, obj in py_io_ns.items(): setattr(test, name, obj) - support.run_unittest(*tests) + suite = unittest.TestSuite([unittest.makeSuite(test) for test in tests]) + return suite if __name__ == "__main__": - test_main() + unittest.main() @@ -1035,6 +1035,9 @@ Tests - 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. Patch by Zachary Ware. |