changeset:   94196:e3dfe942697e
parent:      94194:47c850e0539b
parent:      94195:90b664532d1c
user:        Ned Deily <nad@acm.org>
date:        Sat Jan 17 16:59:50 2015 -0800
files:       Lib/test/test_logging.py Misc/NEWS
description:
Issue #23211: merge from 3.4


diff -r 47c850e0539b -r e3dfe942697e Lib/test/test_logging.py
--- a/Lib/test/test_logging.py	Sat Jan 17 14:29:01 2015 -0800
+++ b/Lib/test/test_logging.py	Sat Jan 17 16:59:50 2015 -0800
@@ -926,10 +926,10 @@
     TIMEOUT = 8.0
     def test_basic(self):
         sockmap = {}
-        server = TestSMTPServer(('localhost', 0), self.process_message, 0.001,
+        server = TestSMTPServer((support.HOST, 0), self.process_message, 0.001,
                                 sockmap)
         server.start()
-        addr = ('localhost', server.port)
+        addr = (support.HOST, server.port)
         h = logging.handlers.SMTPHandler(addr, 'me', 'you', 'Log',
                                          timeout=self.TIMEOUT)
         self.assertEqual(h.toaddrs, ['you'])
diff -r 47c850e0539b -r e3dfe942697e Misc/NEWS
--- a/Misc/NEWS	Sat Jan 17 14:29:01 2015 -0800
+++ b/Misc/NEWS	Sat Jan 17 16:59:50 2015 -0800
@@ -1611,6 +1611,8 @@
 
 - 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
 -----------