openstack
/
neutron
Code Issues Proposed changes

Mock openstacksdk raise_from_response in ironic unit test 

Mocking the openstacksdk exception method raise_from_response
to prevent random error messages even in succeded unit
tests.
An example:
https://zuul.opendev.org/t/openstack/build/943c3f89519c44a58e0b5c86ad4efff8/log/job-output.txt#23782-23789

Change-Id: I3d9128d6712b4094c0b2ad7e12db9e5a915e3d91
Closes-Bug: #1848147
This commit is contained in:
Riccardo Pittau 2019-10-14 17:12:33 +02:00
parent 715001491d
commit dce7af902c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/tests/unit/notifiers/test_ironic.py
View File

@ -19,6 +19,7 @@ import mock
from neutron_lib.api.definitions import portbindings as portbindings_def
from neutron_lib import constants as n_const
from openstack import connection
from openstack import exceptions as os_exc
from neutron.notifiers import batch_notifier
from neutron.notifiers import ironic
@ -176,8 +177,9 @@ class TestIronicNotifier(base.BaseTestCase):
2, len(self.ironic_notifier.batch_notifier._pending_events.queue))
self.assertEqual(2, mock_spawn_n.call_count)
@mock.patch.object(os_exc, 'raise_from_response', return_value=None)
@mock.patch.object(connection.Connection, 'baremetal', autospec=True)
def test_send_events(self, mock_client):
def test_send_events(self, mock_client, mock_os_raise_exc):
self.ironic_notifier.irclient = mock_client
self.ironic_notifier.send_events(['test', 'events'])
mock_client.post.assert_called_with(