Merge "Grease test_try_deallocate_network_retry_direct"

This commit is contained in:
Zuul 2018-08-07 11:09:05 +00:00 committed by Gerrit Code Review
commit 536acbfe05

View File

@ -6266,6 +6266,8 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
self.context, mock.sentinel.instance,
requested_networks=requested_networks)
@mock.patch('oslo_service.loopingcall._ThreadingEvent.wait',
new=mock.Mock())
@mock.patch('nova.compute.manager.ComputeManager._deallocate_network')
@mock.patch('nova.compute.manager.LOG.warning')
def test_try_deallocate_network_retry_direct(self, warning_mock,