openstack
/
nova
Code Issues Proposed changes

Merge "Delete reduplicate code in test_compute_mgr.py"

This commit is contained in:
Jenkins 2016-07-12 10:10:42 +00:00 committed by Gerrit Code Review
parent 6b949d3f4d 0b74a1f76a
commit d219e25452
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nova/tests/unit/compute/test_compute_mgr.py Normal file → Executable file
View File

@ -4126,34 +4126,6 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
[mock.call(self.context, self.instance,
self.requested_networks, self.security_groups)])
@mock.patch.object(manager.ComputeManager, '_build_networks_for_instance')
@mock.patch.object(manager.ComputeManager, '_shutdown_instance')
@mock.patch.object(objects.Instance, 'save')
def test_build_resources_with_network_info_obj_on_spawn_failure(self,
mock_save, mock_shutdown, mock_build):
mock_save.return_value = self.instance
mock_build.return_value = self.network_info
test_exception = test.TestingException()
def fake_spawn():
raise test_exception
try:
with self.compute._build_resources(self.context, self.instance,
self.requested_networks, self.security_groups,
self.image, self.block_device_mapping):
fake_spawn()
except Exception as e:
self.assertEqual(test_exception, e)
mock_save.assert_called_once_with()
mock_build.assert_called_once_with(self.context, self.instance,
self.requested_networks, self.security_groups)
mock_shutdown.assert_called_once_with(self.context, self.instance,
self.block_device_mapping, self.requested_networks,
try_deallocate_networks=False)
@mock.patch.object(manager.ComputeManager, '_build_networks_for_instance')
@mock.patch.object(manager.ComputeManager, '_shutdown_instance')
@mock.patch.object(objects.Instance, 'save')