mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #23211: merge from 3.4

Browse source
This commit is contained in:
Ned Deily 2015-01-17 16:59:50 -08:00
commit cad3eb6d5d
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_logging.py
View file

@ -926,10 +926,10 @@ class SMTPHandlerTest(BaseTest):
TIMEOUT = 8.0 TIMEOUT = 8.0
def test_basic(self): def test_basic(self):
sockmap = {} sockmap = {}
server = TestSMTPServer(('localhost', 0), self.process_message, 0.001, server = TestSMTPServer((support.HOST, 0), self.process_message, 0.001,
sockmap) sockmap)
server.start() server.start()
addr = ('localhost', server.port) addr = (support.HOST, server.port)
h = logging.handlers.SMTPHandler(addr, 'me', 'you', 'Log', h = logging.handlers.SMTPHandler(addr, 'me', 'you', 'Log',
timeout=self.TIMEOUT) timeout=self.TIMEOUT)
self.assertEqual(h.toaddrs, ['you']) self.assertEqual(h.toaddrs, ['you'])

2
Misc/NEWS
View file

@ -1611,6 +1611,8 @@ Tests
- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests. - Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
- Issue #23211: Workaround test_logging failure on some OS X 10.6 systems.
Tools/Demos Tools/Demos
----------- -----------