Merge "py36: Fix test_get_logger_sysloghandler_plumbing" into stable/queens

1 files changed, 9 insertions, 1 deletions

diff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py
index 2355d984c..3d4bd9f7d 100644
--- a/test/unit/common/test_utils.py
+++ b/test/unit/common/test_utils.py
@@ -1541,8 +1541,16 @@ class TestUtils(unittest.TestCase):
         syslog_handler_catcher.LOG_LOCAL0 = orig_sysloghandler.LOG_LOCAL0
         syslog_handler_catcher.LOG_LOCAL3 = orig_sysloghandler.LOG_LOCAL3
 
+        # Some versions of python perform host resolution while initializing
+        # the handler. See https://bugs.python.org/issue30378
+        orig_getaddrinfo = socket.getaddrinfo
+
+        def fake_getaddrinfo(host, *args):
+            return orig_getaddrinfo('localhost', *args)
+
         with mock.patch.object(utils, 'ThreadSafeSysLogHandler',
-                               syslog_handler_catcher):
+                               syslog_handler_catcher), \
+                mock.patch.object(socket, 'getaddrinfo', fake_getaddrinfo):
             utils.get_logger({
                 'log_facility': 'LOG_LOCAL3',
             }, 'server', log_route='server')