openstack
/
nova
Code Issues Proposed changes

Merge "Fix database poison warnings, part 14"

This commit is contained in:
Jenkins 2016-09-28 13:20:39 +00:00 committed by Gerrit Code Review
parent 12ac2e76c2 d98096bd92
commit d115b896ea
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nova/tests/unit/virt/xenapi/test_xenapi.py
View File

@ -3565,34 +3565,38 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBaseNoDB):
{'host': 'host'}, {'host': 'host'},
dest_check_data) dest_check_data)
def test_check_can_live_migrate_works(self): @mock.patch.object(objects.AggregateList, 'get_by_host')
def test_check_can_live_migrate_works(self, mock_get_by_host):
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests) stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
self.conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False) self.conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False)
def fake_aggregate_get_by_host(context, host, key=None): metadata = {'host': 'test_host_uuid'}
self.assertEqual(CONF.host, host) aggregate = objects.Aggregate(metadata=metadata)
return [dict(test_aggregate.fake_aggregate, aggregate_list = objects.AggregateList(objects=[aggregate])
metadetails={"host": "test_host_uuid"})] mock_get_by_host.return_value = aggregate_list
self.stub_out("nova.db.aggregate_get_by_host", instance = objects.Instance(host='host')
fake_aggregate_get_by_host) self.conn.check_can_live_migrate_destination(
self.conn.check_can_live_migrate_destination(self.context, self.context, instance, None, None)
{'host': 'host'}, False, False) mock_get_by_host.assert_called_once_with(
self.context, CONF.host, key='hypervisor_pool')
def test_check_can_live_migrate_fails(self): @mock.patch.object(objects.AggregateList, 'get_by_host')
def test_check_can_live_migrate_fails(self, mock_get_by_host):
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests) stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
self.conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False) self.conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False)
def fake_aggregate_get_by_host(context, host, key=None): metadata = {'dest_other': 'test_host_uuid'}
self.assertEqual(CONF.host, host) aggregate = objects.Aggregate(metadata=metadata)
return [dict(test_aggregate.fake_aggregate, aggregate_list = objects.AggregateList(objects=[aggregate])
metadetails={"dest_other": "test_host_uuid"})] mock_get_by_host.return_value = aggregate_list
self.stub_out("nova.db.aggregate_get_by_host", instance = objects.Instance(host='host')
fake_aggregate_get_by_host)
self.assertRaises(exception.MigrationError, self.assertRaises(exception.MigrationError,
self.conn.check_can_live_migrate_destination, self.conn.check_can_live_migrate_destination,
self.context, {'host': 'host'}, None, None) self.context, instance, None, None)
mock_get_by_host.assert_called_once_with(
self.context, CONF.host, key='hypervisor_pool')
def test_live_migration(self): def test_live_migration(self):
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests) stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)