openstack/swift
Code Issues Proposed changes

Attempt fix test timeouts

Browse Source 
Zuul unit test jobs have sometimes been timing out, often while
executing a test that attempts getaddrinfo. Mock the getaddrinfo call
to see if that helps.

Change-Id: I9ea43bb079bef5aba0aeee899c224da13d34f918
This commit is contained in:
Alistair Coles 2021-12-20 10:16:05 +00:00
parent ebf75f6e2a
commit b1f03149f0
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/unit/common/test_utils.py
View File

@ -5580,17 +5580,34 @@ class TestStatsdLogging(unittest.TestCase):
# instantiation so we don't call getaddrinfo() too often and don't have # instantiation so we don't call getaddrinfo() too often and don't have
# to call bind() on our socket to detect IPv4/IPv6 on every send. # to call bind() on our socket to detect IPv4/IPv6 on every send.
# #
# This test uses the real getaddrinfo, so we patch over the mock to # This test patches over the existing mock. If we just stop the
# put the real one back. If we just stop the mock, then # existing mock, then unittest.exit() blows up, but stacking
# unittest.exit() blows up, but stacking real-fake-real works okay. # real-fake-fake works okay.
with mock.patch.object(utils.socket, 'getaddrinfo', calls = []
self.real_getaddrinfo):
def fake_getaddrinfo(host, port, family, *args):
calls.append(family)
if len(calls) == 1:
raise socket.gaierror
# this is what a real getaddrinfo('::1', port,
# socket.AF_INET6) returned once
return [(socket.AF_INET6,
socket.SOCK_STREAM,
socket.IPPROTO_TCP,
'', ('::1', port, 0, 0)),
(socket.AF_INET6,
socket.SOCK_DGRAM,
socket.IPPROTO_UDP,
'',
('::1', port, 0, 0))]
with mock.patch.object(utils.socket, 'getaddrinfo', fake_getaddrinfo):
logger = utils.get_logger({ logger = utils.get_logger({
'log_statsd_host': '::1', 'log_statsd_host': '::1',
'log_statsd_port': '9876', 'log_statsd_port': '9876',
}, 'some-name', log_route='some-route') }, 'some-name', log_route='some-route')
statsd_client = logger.logger.statsd_client statsd_client = logger.logger.statsd_client
self.assertEqual([socket.AF_INET, socket.AF_INET6], calls)
self.assertEqual(statsd_client._sock_family, socket.AF_INET6) self.assertEqual(statsd_client._sock_family, socket.AF_INET6)
self.assertEqual(statsd_client._target, ('::1', 9876, 0, 0)) self.assertEqual(statsd_client._target, ('::1', 9876, 0, 0))