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

Updated test_logging so that errors don't occur in the absence of threading.

Browse source
This commit is contained in:
Vinay Sajip 2013-09-27 19:08:24 +01:00
parent f6cdffeb78
commit cb2c4fe649
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Lib/test/test_logging.py
View file

@ -78,7 +78,6 @@ try:
except ImportError: except ImportError:
pass pass
class BaseTest(unittest.TestCase): class BaseTest(unittest.TestCase):
"""Base class for logging tests.""" """Base class for logging tests."""
@ -1366,8 +1365,9 @@ class SocketHandlerTest(BaseTest):
"""Test for SocketHandler objects.""" """Test for SocketHandler objects."""
server_class = TestTCPServer if threading:
address = ('localhost', 0) server_class = TestTCPServer
address = ('localhost', 0)
def setUp(self): def setUp(self):
"""Set up a TCP server to receive log messages, and a SocketHandler """Set up a TCP server to receive log messages, and a SocketHandler
@ -1450,7 +1450,8 @@ class UnixSocketHandlerTest(SocketHandlerTest):
"""Test for SocketHandler with unix sockets.""" """Test for SocketHandler with unix sockets."""
server_class = TestUnixStreamServer if threading:
server_class = TestUnixStreamServer
def setUp(self): def setUp(self):
# override the definition in the base class # override the definition in the base class
@ -1466,8 +1467,9 @@ class DatagramHandlerTest(BaseTest):
"""Test for DatagramHandler.""" """Test for DatagramHandler."""
server_class = TestUDPServer if threading:
address = ('localhost', 0) server_class = TestUDPServer
address = ('localhost', 0)
def setUp(self): def setUp(self):
"""Set up a UDP server to receive log messages, and a DatagramHandler """Set up a UDP server to receive log messages, and a DatagramHandler
@ -1520,7 +1522,8 @@ class UnixDatagramHandlerTest(DatagramHandlerTest):
"""Test for DatagramHandler using Unix sockets.""" """Test for DatagramHandler using Unix sockets."""
server_class = TestUnixDatagramServer if threading:
server_class = TestUnixDatagramServer
def setUp(self): def setUp(self):
# override the definition in the base class # override the definition in the base class
@ -1536,8 +1539,9 @@ class SysLogHandlerTest(BaseTest):
"""Test for SysLogHandler using UDP.""" """Test for SysLogHandler using UDP."""
server_class = TestUDPServer if threading:
address = ('localhost', 0) server_class = TestUDPServer
address = ('localhost', 0)
def setUp(self): def setUp(self):
"""Set up a UDP server to receive log messages, and a SysLogHandler """Set up a UDP server to receive log messages, and a SysLogHandler
@ -1593,7 +1597,8 @@ class UnixSysLogHandlerTest(SysLogHandlerTest):
"""Test for SysLogHandler with Unix sockets.""" """Test for SysLogHandler with Unix sockets."""
server_class = TestUnixDatagramServer if threading:
server_class = TestUnixDatagramServer
def setUp(self): def setUp(self):
# override the definition in the base class # override the definition in the base class