Merge.

Lib/test/test_asyncore.py

@@ -789,14 +789,18 @@ class BaseTestAPI(unittest.TestCase):
                                                               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 = 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
     addr = (HOST, 0)