x/python-ganttclient
Code Issues Proposed changes

Merge "Remove compute RPC API version 1.x"

Browse Source
This commit is contained in:
Jenkins
2012-08-31 16:20:14 +00:00
committed by Gerrit Code Review
parent 2a457438e0 c91d2d74f0
commit 8f3c9787a5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/test_libvirt.py
View File

@@ -1810,9 +1810,9 @@ class LibvirtConnTestCase(test.TestCase):
return vdmock return vdmock
self.create_fake_libvirt_mock(lookupByName=fake_lookup) self.create_fake_libvirt_mock(lookupByName=fake_lookup)
self.mox.StubOutWithMock(self.compute, "rollback_live_migration") self.mox.StubOutWithMock(self.compute, "_rollback_live_migration")
self.compute.rollback_live_migration(self.context, instance_ref, self.compute._rollback_live_migration(self.context, instance_ref,
'dest', False) 'dest', False)
#start test #start test
self.mox.ReplayAll() self.mox.ReplayAll()
@@ -1820,7 +1820,7 @@ class LibvirtConnTestCase(test.TestCase):
self.assertRaises(libvirt.libvirtError, self.assertRaises(libvirt.libvirtError,
conn._live_migration, conn._live_migration,
self.context, instance_ref, 'dest', False, self.context, instance_ref, 'dest', False,
self.compute.rollback_live_migration) self.compute._rollback_live_migration)
instance_ref = db.instance_get(self.context, instance_ref['id']) instance_ref = db.instance_get(self.context, instance_ref['id'])
self.assertTrue(instance_ref['vm_state'] == vm_states.ACTIVE) self.assertTrue(instance_ref['vm_state'] == vm_states.ACTIVE)