diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-03 07:06:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-03 07:06:45 +0000 |
| commit | f3a7149a85f78843422a1bf2c822ff8f47f08d7b (patch) | |
| tree | f141014a81ca0e05f29d409f33b7e7129814fdf5 | |
| parent | 67eb98de58ed33607df4c1caae63866cb830999d (diff) | |
| parent | fe87151dacebcf1b1e7475247b4e156f3c2295c5 (diff) | |
| download | nova-f3a7149a85f78843422a1bf2c822ff8f47f08d7b.tar.gz nova-f3a7149a85f78843422a1bf2c822ff8f47f08d7b.tar.xz nova-f3a7149a85f78843422a1bf2c822ff8f47f08d7b.zip | |
Merge "Fix test_migrate_disk_and_power_off_exception"
| -rw-r--r-- | nova/tests/test_libvirt.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 6c609cca8..a48b02f39 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -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 |