x/python-ganttclient
Code Issues Proposed changes

Merge "Fix test_migrate_disk_and_power_off_exception"

Browse Source
This commit is contained in:
Jenkins
2012-03-03 07:06:45 +00:00
committed by Gerrit Code Review
parent ac81fd2701 4555dce710
commit 426f0f78af
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nova/tests/test_libvirt.py
View File

@@ -2122,7 +2122,7 @@ class LibvirtConnectionTestCase(test.TestCase):
self.counter = 0
def fake_get_instance_disk_info(instance):
return []
return '[]'
def fake_destroy(instance, network_info, cleanup=True):
pass
@@ -2133,8 +2133,7 @@ class LibvirtConnectionTestCase(test.TestCase):
def fake_execute(*args, **kwargs):
self.counter += 1
if self.counter == 1:
raise Exception()
pass
assert False, "intentional failure"
def fake_os_path_exists(path):
return True
@@ -2148,9 +2147,10 @@ class LibvirtConnectionTestCase(test.TestCase):
self.stubs.Set(os.path, 'exists', fake_os_path_exists)
ins_ref = self._create_instance()
self.assertRaises(Exception,
self.libvirtconnection.migrate_disk_and_power_off,
None, ins_ref, [], '10.0.0.2', None, None)
self.assertRaises(AssertionError,
self.libvirtconnection.migrate_disk_and_power_off,
None, ins_ref, '10.0.0.2', None, None)
def test_migrate_disk_and_power_off(self):
"""Test for nova.virt.libvirt.connection.LivirtConnection