openstack/aodh
Code Issues Proposed changes

Fix failing nova_tests tests

Browse Source 
Mock also compute.conductor_api.instance_destroy() to return an instance
instead of a MagickMock object.

Change-Id: I518e063abfdd568f7d9ef970bc371eced2198adf
This commit is contained in:
Victor Stinner 2013-11-05 11:09:56 +01:00
parent d180ae8be6
commit f509623e32
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova_tests/test_notifier.py
View File

@ -221,8 +221,11 @@ class TestNovaNotifier(test.BaseTestCase):
mock.patch('nova.openstack.common.notifier.rpc_notifier.notify', mock.patch('nova.openstack.common.notifier.rpc_notifier.notify',
self.notify) self.notify)
): ):
self.compute.terminate_instance(self.context, with mock.patch.object(self.compute.conductor_api,
instance=self.instance) 'instance_destroy',
return_value=self.instance):
self.compute.terminate_instance(self.context,
instance=self.instance)
def tearDown(self): def tearDown(self):
self.Pollster.instances = [] self.Pollster.instances = []