cpython: 603025e2d39d (original) (raw)

Mercurial > cpython

changeset 72065:603025e2d39d

Issue #12656: Fix test_asyncore failures on Windows buildbots. [#12656]

Charles-François Natali neologix@free.fr
date	Thu, 25 Aug 2011 00:50:41 +0200
parents	b07b0b7517da
children	f3444d795062
files	Lib/test/test_asyncore.py
diffstat	1 files changed, 7 insertions(+), 5 deletions(-)[+] [-] Lib/test/test_asyncore.py 12

line wrap: on

line diff

--- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -20,6 +20,8 @@ except ImportError: HOST = support.HOST +HAS_UNIX_SOCKETS = hasattr(socket, 'AF_UNIX') + class dummysocket: def init(self): self.closed = False @@ -89,7 +91,7 @@ def capture_server(evt, buf, serv): def bind_af_aware(sock, addr): """Helper function to bind a socket according to its family."""

if sock.family == socket.AF_UNIX:

if HAS_UNIX_SOCKETS and sock.family == socket.AF_UNIX: # Make sure the path doesn't exist. unlink(addr) sock.bind(addr) @@ -636,7 +638,7 @@ class BaseTestAPI(unittest.TestCase): # Make sure handle_expt is called on OOB data received. # Note: this might fail on some platforms as OOB data is # tenuously supported and rarely used.

   if self.family == socket.AF_UNIX:[](#l1.25)

   if HAS_UNIX_SOCKETS and self.family == socket.AF_UNIX:[](#l1.26)
       self.skipTest("Not applicable to AF_UNIX sockets.")[](#l1.27)

class TestClient(BaseClient): @@ -708,7 +710,7 @@ class BaseTestAPI(unittest.TestCase): self.assertEqual(s.socket.type, socket.SOCK_STREAM | SOCK_NONBLOCK) def test_bind(self):

   if self.family == socket.AF_UNIX:[](#l1.34)

   if HAS_UNIX_SOCKETS and self.family == socket.AF_UNIX:[](#l1.35)
       self.skipTest("Not applicable to AF_UNIX sockets.")[](#l1.36)
   s1 = asyncore.dispatcher()[](#l1.37)
   s1.create_socket(self.family)[](#l1.38)

@@ -722,7 +724,7 @@ class BaseTestAPI(unittest.TestCase): self.assertRaises(socket.error, s2.bind, (self.addr[0], port)) def test_set_reuse_addr(self):

   if self.family == socket.AF_UNIX:[](#l1.43)

   if HAS_UNIX_SOCKETS and self.family == socket.AF_UNIX:[](#l1.44)
       self.skipTest("Not applicable to AF_UNIX sockets.")[](#l1.45)
   sock = socket.socket(self.family)[](#l1.46)
   try:[](#l1.47)

@@ -753,7 +755,7 @@ class TestAPI_UseIPv6Sockets(BaseTestAPI family = socket.AF_INET6 addr = ('::1', 0) -@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'Unix sockets required') +@unittest.skipUnless(HAS_UNIX_SOCKETS, 'Unix sockets required') class TestAPI_UseUnixSockets(BaseTestAPI): family = socket.AF_UNIX addr = support.TESTFN