mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #12656: Fix test_asyncore failures on Windows buildbots.

Browse source
This commit is contained in:
Charles-François Natali 2011-08-25 00:50:41 +02:00
parent e78cbecaf1
commit e3540b47d1
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_asyncore.py
View file

@ -20,6 +20,8 @@ except ImportError:
HOST = support.HOST HOST = support.HOST
HAS_UNIX_SOCKETS = hasattr(socket, 'AF_UNIX')
class dummysocket: class dummysocket:
def __init__(self): def __init__(self):
self.closed = False self.closed = False
@ -89,7 +91,7 @@ def capture_server(evt, buf, serv):
def bind_af_aware(sock, addr): def bind_af_aware(sock, addr):
"""Helper function to bind a socket according to its family.""" """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. # Make sure the path doesn't exist.
unlink(addr) unlink(addr)
sock.bind(addr) sock.bind(addr)
@ -636,7 +638,7 @@ class BaseTestAPI(unittest.TestCase):
# Make sure handle_expt is called on OOB data received. # Make sure handle_expt is called on OOB data received.
# Note: this might fail on some platforms as OOB data is # Note: this might fail on some platforms as OOB data is
# tenuously supported and rarely used. # tenuously supported and rarely used.
if self.family == socket.AF_UNIX: if HAS_UNIX_SOCKETS and self.family == socket.AF_UNIX:
self.skipTest("Not applicable to AF_UNIX sockets.") self.skipTest("Not applicable to AF_UNIX sockets.")
class TestClient(BaseClient): class TestClient(BaseClient):
@ -708,7 +710,7 @@ class BaseTestAPI(unittest.TestCase):
self.assertEqual(s.socket.type, socket.SOCK_STREAM | SOCK_NONBLOCK) self.assertEqual(s.socket.type, socket.SOCK_STREAM | SOCK_NONBLOCK)
def test_bind(self): def test_bind(self):
if self.family == socket.AF_UNIX: if HAS_UNIX_SOCKETS and self.family == socket.AF_UNIX:
self.skipTest("Not applicable to AF_UNIX sockets.") self.skipTest("Not applicable to AF_UNIX sockets.")
s1 = asyncore.dispatcher() s1 = asyncore.dispatcher()
s1.create_socket(self.family) s1.create_socket(self.family)
@ -722,7 +724,7 @@ class BaseTestAPI(unittest.TestCase):
self.assertRaises(socket.error, s2.bind, (self.addr[0], port)) self.assertRaises(socket.error, s2.bind, (self.addr[0], port))
def test_set_reuse_addr(self): def test_set_reuse_addr(self):
if self.family == socket.AF_UNIX: if HAS_UNIX_SOCKETS and self.family == socket.AF_UNIX:
self.skipTest("Not applicable to AF_UNIX sockets.") self.skipTest("Not applicable to AF_UNIX sockets.")
sock = socket.socket(self.family) sock = socket.socket(self.family)
try: try:
@ -753,7 +755,7 @@ class TestAPI_UseIPv6Sockets(BaseTestAPI):
family = socket.AF_INET6 family = socket.AF_INET6
addr = ('::1', 0) addr = ('::1', 0)
@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'Unix sockets required') @unittest.skipUnless(HAS_UNIX_SOCKETS, 'Unix sockets required')
class TestAPI_UseUnixSockets(BaseTestAPI): class TestAPI_UseUnixSockets(BaseTestAPI):
family = socket.AF_UNIX family = socket.AF_UNIX
addr = support.TESTFN addr = support.TESTFN