commit 0175af85a574800d8ea44e57fc9c0810edf2d0e1
author Stefan Krah <skrah@bytereef.org> Fri Mar 23 16:37:41 2012 +0100
committer Stefan Krah <skrah@bytereef.org> Fri Mar 23 16:37:41 2012 +0100
tree 913860bbc0f391aa2dae6a97cda343ce6776ba24
parent c64150bcac747272199945f212b7aa0845d1102d
parent 080e1cc33ab98a0ea4a2653b6ed090dd4ecb4fd8

Merge.

Lib/test/test_asyncore.py

diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index 0bd09fd..1123c25 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -789,13 +789,17 @@
                                                               count=500))
             t.start()
 
-            for x in range(20):
-                s = socket.socket(self.family, socket.SOCK_STREAM)
-                s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER,
-                             struct.pack('ii', 1, 0))
-                s.connect(server.address)
-                s.close()
 
+            s = socket.socket(self.family, socket.SOCK_STREAM)
+            s.settimeout(.2)
+            s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER,
+                         struct.pack('ii', 1, 0))
+            try:
+                s.connect(server.address)
+            except socket.error:
+                pass
+            finally:
+                s.close()
 
 class TestAPI_UseIPv4Sockets(BaseTestAPI):
     family = socket.AF_INET