#16896: test_asyncore now works with unittest test discovery. Patch by Zachary Ware.

This commit is contained in:
Ezio Melotti 2013-01-10 05:28:52 +02:00
parent f472a90d31
commit 47236db1d0
2 changed files with 11 additions and 16 deletions

View File

@ -513,7 +513,7 @@ class BaseClient(BaseTestHandler):
pass
class BaseTestAPI(unittest.TestCase):
class BaseTestAPI:
def tearDown(self):
asyncore.close_all()
@ -821,34 +821,26 @@ class TestAPI_UseUnixSockets(BaseTestAPI):
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()

View File

@ -408,6 +408,9 @@ Library
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.