From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Fri, 23 Mar 2012 14:09:58 +0000 (+0100)
Subject: attempt to fix asyncore buildbot failure
X-Git-Tag: v3.3.0a2~74^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7ea19fee8aa10fb88f96899f1f3fe3ead59f893;p=thirdparty%2FPython%2Fcpython.git

attempt to fix asyncore buildbot failure
---

c7ea19fee8aa10fb88f96899f1f3fe3ead59f893
diff --cc Lib/test/test_asyncore.py
index 0bd09fd737ad,5f55df89f51c..1123c251ebd4
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@@ -783,40 -735,23 +783,44 @@@ class BaseTestAPI(unittest.TestCase)
      @support.reap_threads
      def test_quick_connect(self):
          # see: http://bugs.python.org/issue10340
 -        server = TCPServer()
 -        t = threading.Thread(target=lambda: asyncore.loop(timeout=0.1, count=500))
 -        t.start()
 +        if self.family in (socket.AF_INET, getattr(socket, "AF_INET6", object())):
 +            server = BaseServer(self.family, self.addr)
 +            t = threading.Thread(target=lambda: asyncore.loop(timeout=0.1,
 +                                                              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))
+ 
 -        for x in range(20):
 -            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
++            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_UseSelect(BaseTestAPI):
 +class TestAPI_UseIPv4Sockets(BaseTestAPI):
 +    family = socket.AF_INET
 +    addr = (HOST, 0)
 +
 +@unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 support required')
 +class TestAPI_UseIPv6Sockets(BaseTestAPI):
 +    family = socket.AF_INET6
 +    addr = ('::1', 0)
 +
 +@unittest.skipUnless(HAS_UNIX_SOCKETS, 'Unix sockets required')
 +class TestAPI_UseUnixSockets(BaseTestAPI):
 +    if HAS_UNIX_SOCKETS:
 +        family = socket.AF_UNIX
 +    addr = support.TESTFN
 +
 +    def tearDown(self):
 +        unlink(self.addr)
 +        BaseTestAPI.tearDown(self)
 +
 +class TestAPI_UseIPv4Select(TestAPI_UseIPv4Sockets):
      use_poll = False
  
  @unittest.skipUnless(hasattr(select, 'poll'), 'select.poll required')