diff options
| author | Tim Burke <tim.burke@gmail.com> | 2018-06-21 15:43:26 -0700 |
|---|---|---|
| committer | Tim Burke <tim@swiftstack.com> | 2018-07-24 18:28:34 +0000 |
| commit | e2cfc98dd8c89e70bffeca83e3497fc7708b3eb6 (patch) | |
| tree | 5b990c5dfe1ab29fa36d0160302244968f58f040 | |
| parent | caeeb5412359d24b69013639a34272009cea5c63 (diff) | |
| download | swift-e2cfc98dd8c89e70bffeca83e3497fc7708b3eb6.tar.gz | |
py36: Fix test_get_logger_sysloghandler_plumbing
Change-Id: Ibdb9e2bbec1c962d930a3f69fc95a8c562ac13b7
(cherry picked from commit 1318bacc177d060f95b244cc2a1075fe43d4699a)
| -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 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') |