openstack
/
octavia
Code Issues Proposed changes

Merge "Fix AttributeError in exception handler" into stable/ussuri

This commit is contained in:
Zuul 2022-04-27 14:56:00 +00:00 committed by Gerrit Code Review
parent 9838a350a7 7f23fbaedd
commit 672c6b93e1
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
octavia/amphorae/backends/utils/haproxy_query.py
View File

@ -155,6 +155,5 @@ class HAProxyQuery(object):
except Exception as e:
# Catch any exception - may be socket issue, or write permission
# issue as well.
LOG.warning("Unable to save state: %(err)s %(output)s",
{'err': e, 'output': e.output})
LOG.warning("Unable to save state: %r", e)
return False

12
octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py
View File

@ -159,3 +159,15 @@ class QueryTestCase(base.TestCase):
self.q.save_state(filename)
mock_fh.write.assert_called_once_with('DATA')
def test_save_state_error(self):
"""save_state() should swallow exceptions"""
filename = 'state_file'
query_mock = mock.Mock(side_effect=OSError())
self.q._query = query_mock
try:
self.q.save_state(filename)
except Exception as ex:
self.fail("save_state() raised %r unexpectedly!" % ex)