[Python-checkins] cpython (3.3): #16896: test_asyncore now works with unittest test discovery. Patch by Zachary
ezio.melotti
python-checkins at python.org
Thu Jan 10 04:29:54 CET 2013
http://hg.python.org/cpython/rev/4976bf1d751c
changeset: 81348:4976bf1d751c
branch: 3.3
parent: 81346:f32cb5389a4b
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Thu Jan 10 05:28:52 2013 +0200
summary:
#16896: test_asyncore now works with unittest test discovery. Patch by Zachary Ware.
files:
Lib/test/test_asyncore.py | 24 ++++++++----------------
Misc/NEWS | 3 +++
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -513,7 +513,7 @@
pass
-class BaseTestAPI(unittest.TestCase):
+class BaseTestAPI:
def tearDown(self):
asyncore.close_all()
@@ -821,34 +821,26 @@
unlink(self.addr)
BaseTestAPI.tearDown(self)
-class TestAPI_UseIPv4Select(TestAPI_UseIPv4Sockets):
+class TestAPI_UseIPv4Select(TestAPI_UseIPv4Sockets, unittest.TestCase):
use_poll = False
@unittest.skipUnless(hasattr(select, 'poll'), 'select.poll required')
-class TestAPI_UseIPv4Poll(TestAPI_UseIPv4Sockets):
+class TestAPI_UseIPv4Poll(TestAPI_UseIPv4Sockets, unittest.TestCase):
use_poll = True
-class TestAPI_UseIPv6Select(TestAPI_UseIPv6Sockets):
+class TestAPI_UseIPv6Select(TestAPI_UseIPv6Sockets, unittest.TestCase):
use_poll = False
@unittest.skipUnless(hasattr(select, 'poll'), 'select.poll required')
-class TestAPI_UseIPv6Poll(TestAPI_UseIPv6Sockets):
+class TestAPI_UseIPv6Poll(TestAPI_UseIPv6Sockets, unittest.TestCase):
use_poll = True
-class TestAPI_UseUnixSocketsSelect(TestAPI_UseUnixSockets):
+class TestAPI_UseUnixSocketsSelect(TestAPI_UseUnixSockets, unittest.TestCase):
use_poll = False
@unittest.skipUnless(hasattr(select, 'poll'), 'select.poll required')
-class TestAPI_UseUnixSocketsPoll(TestAPI_UseUnixSockets):
+class TestAPI_UseUnixSocketsPoll(TestAPI_UseUnixSockets, unittest.TestCase):
use_poll = True
-def test_main():
- tests = [HelperFunctionTests, DispatcherTests, DispatcherWithSendTests,
- DispatcherWithSendTests_UsePoll, FileWrapperTest,
- TestAPI_UseIPv4Select, TestAPI_UseIPv4Poll, TestAPI_UseIPv6Select,
- TestAPI_UseIPv6Poll, TestAPI_UseUnixSocketsSelect,
- TestAPI_UseUnixSocketsPoll]
- run_unittest(*tests)
-
if __name__ == "__main__":
- test_main()
+ unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -408,6 +408,9 @@
Tests
-----
+- Issue #16896: test_asyncore now works with unittest test discovery.
+ Patch by Zachary Ware.
+
- Issue #16897: test_bisect now works with unittest test discovery.
Initial patch by Zachary Ware.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list