openstack/deb-nova
Code Issues Proposed changes

Merge "Do not use contextlib.nested if only mock one function"

Browse Source
This commit is contained in:
Jenkins
2014-01-12 05:22:38 +00:00
committed by Gerrit Code Review
parent b2b9aef417 8c359e0d0c
commit 7b19c4db6b
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nova/tests/compute/test_compute_mgr.py
View File

@@ -331,12 +331,8 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
self._test_init_instance_reverts_crashed_migrations(old_vm_state=None)
def test_init_instance_sets_building_error(self):
with contextlib.nested(
mock.patch.object(self.compute, '_instance_update')
) as (
_instance_update,
):
with mock.patch.object(self.compute, '_instance_update'
) as _instance_update:
instance = instance_obj.Instance(self.context)
instance.uuid = 'foo'
instance.vm_state = vm_states.BUILDING
@@ -348,11 +344,8 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
_instance_update.assert_has_calls([call])
def _test_init_instance_sets_building_tasks_error(self, instance):
with contextlib.nested(
mock.patch.object(self.compute, '_instance_update')
) as (
_instance_update,
):
with mock.patch.object(self.compute, '_instance_update'
) as _instance_update:
self.compute._init_instance(self.context, instance)
call = mock.call(self.context, 'foo',
task_state=None,
@@ -388,11 +381,8 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
self._test_init_instance_sets_building_tasks_error(instance)
def _test_init_instance_cleans_image_states(self, instance):
with contextlib.nested(
mock.patch.object(self.compute, '_instance_update')
) as (
_instance_update,
):
with mock.patch.object(self.compute, '_instance_update'
) as _instance_update:
self.compute._init_instance(self.context, instance)
call = mock.call(self.context, 'foo', task_state=None)
_instance_update.assert_has_calls([call])