traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Merge 3.4) Issue #21636: Fix test_logging, skip UNIX stream (AF_UNIX) tests on 

Windows. Patch written by Claudiu Popa.
This commit is contained in:
Victor Stinner 2014-06-02 14:43:24 +02:00
parent f849f46487 ec5a860e60
commit 8ff373714c
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Lib/test/test_logging.py
View File

@ -860,9 +860,6 @@ if threading:
super(TestTCPServer, self).server_bind() super(TestTCPServer, self).server_bind()
self.port = self.socket.getsockname()[1] self.port = self.socket.getsockname()[1]
class TestUnixStreamServer(TestTCPServer):
address_family = socket.AF_UNIX
class TestUDPServer(ControlMixin, ThreadingUDPServer): class TestUDPServer(ControlMixin, ThreadingUDPServer):
""" """
A UDP server which is controllable using :class:`ControlMixin`. A UDP server which is controllable using :class:`ControlMixin`.
@ -910,8 +907,12 @@ if threading:
super(TestUDPServer, self).server_close() super(TestUDPServer, self).server_close()
self._closed = True self._closed = True
class TestUnixDatagramServer(TestUDPServer): if hasattr(socket, "AF_UNIX"):
address_family = socket.AF_UNIX class TestUnixStreamServer(TestTCPServer):
address_family = socket.AF_UNIX
class TestUnixDatagramServer(TestUDPServer):
address_family = socket.AF_UNIX
# - end of server_helper section # - end of server_helper section
@ -1452,12 +1453,13 @@ def _get_temp_domain_socket():
os.remove(fn) os.remove(fn)
return fn return fn
@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
@unittest.skipUnless(threading, 'Threading required for this test.') @unittest.skipUnless(threading, 'Threading required for this test.')
class UnixSocketHandlerTest(SocketHandlerTest): class UnixSocketHandlerTest(SocketHandlerTest):
"""Test for SocketHandler with unix sockets.""" """Test for SocketHandler with unix sockets."""
if threading: if threading and hasattr(socket, "AF_UNIX"):
server_class = TestUnixStreamServer server_class = TestUnixStreamServer
def setUp(self): def setUp(self):
@ -1523,13 +1525,13 @@ class DatagramHandlerTest(BaseTest):
self.handled.wait() self.handled.wait()
self.assertEqual(self.log_output, "spam\neggs\n") self.assertEqual(self.log_output, "spam\neggs\n")
@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
@unittest.skipUnless(threading, 'Threading required for this test.') @unittest.skipUnless(threading, 'Threading required for this test.')
class UnixDatagramHandlerTest(DatagramHandlerTest): class UnixDatagramHandlerTest(DatagramHandlerTest):
"""Test for DatagramHandler using Unix sockets.""" """Test for DatagramHandler using Unix sockets."""
if threading: if threading and hasattr(socket, "AF_UNIX"):
server_class = TestUnixDatagramServer server_class = TestUnixDatagramServer
def setUp(self): def setUp(self):
@ -1598,13 +1600,13 @@ class SysLogHandlerTest(BaseTest):
self.handled.wait() self.handled.wait()
self.assertEqual(self.log_output, b'<11>h\xc3\xa4m-sp\xc3\xa4m') self.assertEqual(self.log_output, b'<11>h\xc3\xa4m-sp\xc3\xa4m')
@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")
@unittest.skipUnless(threading, 'Threading required for this test.') @unittest.skipUnless(threading, 'Threading required for this test.')
class UnixSysLogHandlerTest(SysLogHandlerTest): class UnixSysLogHandlerTest(SysLogHandlerTest):
"""Test for SysLogHandler with Unix sockets.""" """Test for SysLogHandler with Unix sockets."""
if threading: if threading and hasattr(socket, "AF_UNIX"):
server_class = TestUnixDatagramServer server_class = TestUnixDatagramServer
def setUp(self): def setUp(self):