Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
9fcdaf15
Commit
9fcdaf15
authored
Jun 02, 2014
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #21636: Fix test_logging, skip UNIX stream (AF_UNIX) tests on Windows.
Patch written by Claudiu Popa.
parent
1ab27093
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
Lib/test/test_logging.py
Lib/test/test_logging.py
+12
-10
No files found.
Lib/test/test_logging.py
View file @
9fcdaf15
...
@@ -865,9 +865,6 @@ if threading:
...
@@ -865,9 +865,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`.
...
@@ -915,8 +912,12 @@ if threading:
...
@@ -915,8 +912,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
...
@@ -1457,12 +1458,13 @@ def _get_temp_domain_socket():
...
@@ -1457,12 +1458,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):
...
@@ -1528,13 +1530,13 @@ class DatagramHandlerTest(BaseTest):
...
@@ -1528,13 +1530,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):
...
@@ -1603,13 +1605,13 @@ class SysLogHandlerTest(BaseTest):
...
@@ -1603,13 +1605,13 @@ class SysLogHandlerTest(BaseTest):
self.handled.wait()
self.handled.wait()
self.assertEqual(self.log_output, b'<11>h
\
xc3
\
xa4
m-sp
\
xc3
\
xa4
m')
self.assertEqual(self.log_output, b'<11>h
\
xc3
\
xa4
m-sp
\
xc3
\
xa4
m')
@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):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment