From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Fri, 23 Mar 2012 14:04:27 +0000 (+0100)
Subject: attempt to fix asyncore buildbot failure
X-Git-Tag: v2.7.4rc1~949
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea605cd1526431380e4b15c2ea58dd81ff18a88d;p=thirdparty%2FPython%2Fcpython.git

attempt to fix asyncore buildbot failure
---

diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index f2fbc589c38d..b8dfad279f31 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -714,10 +714,15 @@ class BaseTestAPI(unittest.TestCase):
 
         for x in xrange(20):
             s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            s.settimeout(.2)
             s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER,
                          struct.pack('ii', 1, 0))
-            s.connect(server.address)
-            s.close()
+            try:
+                s.connect(server.address)
+            except socket.error:
+                pass
+            finally:
+                s.close()
 
 
 class TestAPI_UseSelect(BaseTestAPI):