diff options
author | Zuul <zuul@review.openstack.org> | 2018-08-02 23:09:36 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-08-02 23:09:36 +0000 |
commit | 679960cbef0c5329ad9a33e4118f1014f51d5999 (patch) | |
tree | 24db89b7a02469545d1c16006ebdee1ede64eb55 | |
parent | 287991f40e997417939e945b7f2661d20371be30 (diff) | |
parent | 6b6940007c587d8aa69471ceda501b9e50105803 (diff) | |
download | swift-679960cbef0c5329ad9a33e4118f1014f51d5999.tar.gz |
Merge "py36: Fix test_get_logger_sysloghandler_plumbing" into stable/pike
-rw-r--r-- | test/unit/common/test_utils.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py index 87a5de403..f098b92f5 100644 --- a/test/unit/common/test_utils.py +++ b/test/unit/common/test_utils.py @@ -1501,8 +1501,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') |