diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-08-20 22:22:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-08-20 22:22:19 +0000 |
| commit | 20991d38b2ee786190d88d44d72a2a3464288258 (patch) | |
| tree | 60c10a574a0b41878b184869e374478e901385fe /nova/tests/virt/hyperv | |
| parent | a075f1fa7e49b4b3956f43abce890879b8966a35 (diff) | |
| parent | 3a5919fd4af6c3b772397a5e7d90eebdf9b371af (diff) | |
| download | nova-20991d38b2ee786190d88d44d72a2a3464288258.tar.gz | |
Merge "Fixes Hyper-V resize down exception"
Diffstat (limited to 'nova/tests/virt/hyperv')
| -rw-r--r-- | nova/tests/virt/hyperv/test_hypervapi.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/virt/hyperv/test_hypervapi.py b/nova/tests/virt/hyperv/test_hypervapi.py index 99b717e65e..06bfb1eb19 100644 --- a/nova/tests/virt/hyperv/test_hypervapi.py +++ b/nova/tests/virt/hyperv/test_hypervapi.py @@ -1513,7 +1513,7 @@ class HyperVAPITestCase(HyperVAPIBaseTestCase, (instance, fake_dest_ip, network_info, flavor) = args self._mox.ReplayAll() - self.assertRaises(vmutils.VHDResizeException, + self.assertRaises(exception.InstanceFaultRollback, self._conn.migrate_disk_and_power_off, self._context, instance, fake_dest_ip, flavor, network_info) |