openstack/nova
Code Issues Proposed changes

Merge "Fix database poison warnings, part 3"

Browse Source
This commit is contained in:
Jenkins
2016-04-19 17:49:43 +00:00
committed by Gerrit Code Review
parent 3d4f257aa9 70de70c71c
commit d2d5f10175
1 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
nova/tests/unit/compute/test_compute_api.py
View File

@@ -13,7 +13,6 @@
"""Unit tests for compute API.""" """Unit tests for compute API."""
import copy
import datetime import datetime
import iso8601 import iso8601
@@ -1133,8 +1132,8 @@ class _ComputeAPIUnitTestMixIn(object):
updates = {'progress': 0, 'task_state': task_states.DELETING} updates = {'progress': 0, 'task_state': task_states.DELETING}
self.mox.StubOutWithMock(inst, 'save') self.mox.StubOutWithMock(inst, 'save')
self.mox.StubOutWithMock(db, self.mox.StubOutWithMock(objects.BlockDeviceMappingList,
'block_device_mapping_get_all_by_instance') 'get_by_instance_uuid')
self.mox.StubOutWithMock(db, 'constraint') self.mox.StubOutWithMock(db, 'constraint')
self.mox.StubOutWithMock(db, 'instance_destroy') self.mox.StubOutWithMock(db, 'instance_destroy')
@@ -1147,8 +1146,9 @@ class _ComputeAPIUnitTestMixIn(object):
rpcapi = self.compute_api.compute_rpcapi rpcapi = self.compute_api.compute_rpcapi
self.mox.StubOutWithMock(rpcapi, 'terminate_instance') self.mox.StubOutWithMock(rpcapi, 'terminate_instance')
db.block_device_mapping_get_all_by_instance(self.context, objects.BlockDeviceMappingList.get_by_instance_uuid(
inst.uuid).AndReturn([]) self.context, inst.uuid).AndReturn(
objects.BlockDeviceMappingList())
inst.save() inst.save()
self.compute_api._create_reservations(self.context, self.compute_api._create_reservations(self.context,
inst, inst.task_state, inst, inst.task_state,
@@ -1275,15 +1275,16 @@ class _ComputeAPIUnitTestMixIn(object):
def test_delete_soft_rollback(self): def test_delete_soft_rollback(self):
inst = self._create_instance_obj() inst = self._create_instance_obj()
self.mox.StubOutWithMock(db, self.mox.StubOutWithMock(objects.BlockDeviceMappingList,
'block_device_mapping_get_all_by_instance') 'get_by_instance_uuid')
self.mox.StubOutWithMock(inst, 'save') self.mox.StubOutWithMock(inst, 'save')
delete_time = datetime.datetime(1955, 11, 5) delete_time = datetime.datetime(1955, 11, 5)
self.useFixture(utils_fixture.TimeFixture(delete_time)) self.useFixture(utils_fixture.TimeFixture(delete_time))
db.block_device_mapping_get_all_by_instance( objects.BlockDeviceMappingList.get_by_instance_uuid(
self.context, inst.uuid).AndReturn([]) self.context, inst.uuid).AndReturn(
objects.BlockDeviceMappingList())
inst.save().AndRaise(test.TestingException) inst.save().AndRaise(test.TestingException)
self.mox.ReplayAll() self.mox.ReplayAll()
@@ -1304,6 +1305,7 @@ class _ComputeAPIUnitTestMixIn(object):
self.mox.StubOutWithMock(compute_utils, 'downsize_quota_delta') self.mox.StubOutWithMock(compute_utils, 'downsize_quota_delta')
self.mox.StubOutWithMock(compute_utils, 'reserve_quota_delta') self.mox.StubOutWithMock(compute_utils, 'reserve_quota_delta')
self.mox.StubOutWithMock(fake_mig, 'save') self.mox.StubOutWithMock(fake_mig, 'save')
self.mox.StubOutWithMock(quota.QUOTAS, 'commit')
self.mox.StubOutWithMock(self.compute_api, '_record_action_start') self.mox.StubOutWithMock(self.compute_api, '_record_action_start')
self.mox.StubOutWithMock(self.compute_api.compute_rpcapi, self.mox.StubOutWithMock(self.compute_api.compute_rpcapi,
'confirm_resize') 'confirm_resize')
@@ -1328,7 +1330,8 @@ class _ComputeAPIUnitTestMixIn(object):
fake_mig.save().WithSideEffects(_check_mig) fake_mig.save().WithSideEffects(_check_mig)
if self.cell_type: if self.cell_type:
fake_quotas.commit() quota.QUOTAS.commit(self.context, resvs, project_id=None,
user_id=None)
self.compute_api._record_action_start(self.context, fake_inst, self.compute_api._record_action_start(self.context, fake_inst,
'confirmResize') 'confirmResize')
@@ -1366,6 +1369,7 @@ class _ComputeAPIUnitTestMixIn(object):
self.mox.StubOutWithMock(compute_utils, 'reserve_quota_delta') self.mox.StubOutWithMock(compute_utils, 'reserve_quota_delta')
self.mox.StubOutWithMock(fake_inst, 'save') self.mox.StubOutWithMock(fake_inst, 'save')
self.mox.StubOutWithMock(fake_mig, 'save') self.mox.StubOutWithMock(fake_mig, 'save')
self.mox.StubOutWithMock(quota.QUOTAS, 'commit')
self.mox.StubOutWithMock(self.compute_api, '_record_action_start') self.mox.StubOutWithMock(self.compute_api, '_record_action_start')
self.mox.StubOutWithMock(self.compute_api.compute_rpcapi, self.mox.StubOutWithMock(self.compute_api.compute_rpcapi,
'revert_resize') 'revert_resize')
@@ -1396,7 +1400,8 @@ class _ComputeAPIUnitTestMixIn(object):
fake_mig.save().WithSideEffects(_check_mig) fake_mig.save().WithSideEffects(_check_mig)
if self.cell_type: if self.cell_type:
fake_quotas.commit() quota.QUOTAS.commit(self.context, resvs, project_id=None,
user_id=None)
self.compute_api._record_action_start(self.context, fake_inst, self.compute_api._record_action_start(self.context, fake_inst,
'revertResize') 'revertResize')
@@ -1426,6 +1431,7 @@ class _ComputeAPIUnitTestMixIn(object):
'reverse_upsize_quota_delta') 'reverse_upsize_quota_delta')
self.mox.StubOutWithMock(compute_utils, 'reserve_quota_delta') self.mox.StubOutWithMock(compute_utils, 'reserve_quota_delta')
self.mox.StubOutWithMock(fake_inst, 'save') self.mox.StubOutWithMock(fake_inst, 'save')
self.mox.StubOutWithMock(quota.QUOTAS, 'rollback')
self.context.elevated().AndReturn(self.context) self.context.elevated().AndReturn(self.context)
objects.Migration.get_by_instance_and_status( objects.Migration.get_by_instance_and_status(
@@ -1445,7 +1451,8 @@ class _ComputeAPIUnitTestMixIn(object):
expected={'task_state': [None]}) expected={'task_state': [None]})
fake_inst.save(expected_task_state=[None]).AndRaise(exc) fake_inst.save(expected_task_state=[None]).AndRaise(exc)
fake_quotas.rollback() quota.QUOTAS.rollback(self.context, resvs, project_id=None,
user_id=None)
self.mox.ReplayAll() self.mox.ReplayAll()
self.assertRaises(exception.UnexpectedTaskStateError, self.assertRaises(exception.UnexpectedTaskStateError,
@@ -1474,6 +1481,7 @@ class _ComputeAPIUnitTestMixIn(object):
self.mox.StubOutWithMock(compute_utils, 'upsize_quota_delta') self.mox.StubOutWithMock(compute_utils, 'upsize_quota_delta')
self.mox.StubOutWithMock(compute_utils, 'reserve_quota_delta') self.mox.StubOutWithMock(compute_utils, 'reserve_quota_delta')
self.mox.StubOutWithMock(fake_inst, 'save') self.mox.StubOutWithMock(fake_inst, 'save')
self.mox.StubOutWithMock(quota.QUOTAS, 'commit')
self.mox.StubOutWithMock(self.compute_api, '_record_action_start') self.mox.StubOutWithMock(self.compute_api, '_record_action_start')
self.mox.StubOutWithMock(self.compute_api.compute_task_api, self.mox.StubOutWithMock(self.compute_api.compute_task_api,
'resize_instance') 'resize_instance')
@@ -1524,7 +1532,9 @@ class _ComputeAPIUnitTestMixIn(object):
else: else:
expected_reservations = [] expected_reservations = []
if self.cell_type == 'api': if self.cell_type == 'api':
fake_quotas.commit() if flavor_id_passed:
quota.QUOTAS.commit(self.context, resvs, project_id=None,
user_id=None)
expected_reservations = [] expected_reservations = []
mig = objects.Migration() mig = objects.Migration()
@@ -2272,8 +2282,10 @@ class _ComputeAPIUnitTestMixIn(object):
quiesced = [False, False] quiesced = [False, False]
quiesce_expected = not quiesce_fails and vm_state == vm_states.ACTIVE quiesce_expected = not quiesce_fails and vm_state == vm_states.ACTIVE
def fake_get_all_by_instance(context, instance, use_slave=False): @classmethod
return copy.deepcopy(instance_bdms) def fake_bdm_list_get_by_instance_uuid(cls, context, instance_uuid):
return obj_base.obj_make_list(context, cls(),
objects.BlockDeviceMapping, instance_bdms)
def fake_image_create(context, image_meta, data=None): def fake_image_create(context, image_meta, data=None):
self.assertThat(image_meta, matchers.DictMatches(expect_meta)) self.assertThat(image_meta, matchers.DictMatches(expect_meta))
@@ -2293,8 +2305,9 @@ class _ComputeAPIUnitTestMixIn(object):
def fake_unquiesce_instance(context, instance, mapping=None): def fake_unquiesce_instance(context, instance, mapping=None):
quiesced[1] = True quiesced[1] = True
self.stub_out('nova.db.block_device_mapping_get_all_by_instance', self.stub_out('nova.objects.BlockDeviceMappingList'
fake_get_all_by_instance) '.get_by_instance_uuid',
fake_bdm_list_get_by_instance_uuid)
self.stubs.Set(self.compute_api.image_api, 'create', self.stubs.Set(self.compute_api.image_api, 'create',
fake_image_create) fake_image_create)
self.stubs.Set(self.compute_api.volume_api, 'get', self.stubs.Set(self.compute_api.volume_api, 'get',