From: Charles-François Natali <neologix@free.fr>
Date: Mon, 31 Oct 2011 11:08:09 +0000 (+0100)
Subject: test_asyncore: Enable tests of Unix domain sockets with poll().
X-Git-Tag: v3.3.0a1~1007
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39648d11ab487fcc5e3ad88e06ced9c96e45cd43;p=thirdparty%2FPython%2Fcpython.git

test_asyncore: Enable tests of Unix domain sockets with poll().
---

diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index dccdfed540ca..c1b8637c1801 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -792,7 +792,6 @@ class TestAPI_UseUnixSockets(BaseTestAPI):
     if HAS_UNIX_SOCKETS:
         family = socket.AF_UNIX
     addr = support.TESTFN
-    use_poll = False
 
     def tearDown(self):
         unlink(self.addr)
@@ -812,11 +811,19 @@ class TestAPI_UseIPv6Select(TestAPI_UseIPv6Sockets):
 class TestAPI_UseIPv6Poll(TestAPI_UseIPv6Sockets):
     use_poll = True
 
+class TestAPI_UseUnixSocketsSelect(TestAPI_UseUnixSockets):
+    use_poll = False
+
+@unittest.skipUnless(hasattr(select, 'poll'), 'select.poll required')
+class TestAPI_UseUnixSocketsPoll(TestAPI_UseUnixSockets):
+    use_poll = True
+
 def test_main():
     tests = [HelperFunctionTests, DispatcherTests, DispatcherWithSendTests,
             DispatcherWithSendTests_UsePoll, FileWrapperTest,
             TestAPI_UseIPv4Select, TestAPI_UseIPv4Poll, TestAPI_UseIPv6Select,
-            TestAPI_UseIPv6Poll, TestAPI_UseUnixSockets]
+            TestAPI_UseIPv6Poll, TestAPI_UseUnixSocketsSelect,
+            TestAPI_UseUnixSocketsPoll]
     run_unittest(*tests)
 
 if __name__ == "__main__":