openstack
/
nova
Code Issues Proposed changes

Merge "Remove redundant swap_volume tests"

This commit is contained in:
Zuul 2018-01-23 03:59:01 +00:00 committed by Gerrit Code Review
parent ee869dc744 01569b42d6
commit 7e5d93edc5
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -15487,9 +15487,8 @@ class LibvirtConnTestCase(test.NoDBTestCase,
@mock.patch('nova.virt.libvirt.driver.LibvirtDriver._get_volume_config')
@mock.patch('nova.virt.libvirt.driver.LibvirtDriver._connect_volume')
@mock.patch('nova.virt.libvirt.host.Host.get_guest')
def _test_swap_volume_driver(self, get_guest, connect_volume,
get_volume_config, swap_volume,
disconnect_volume, source_type):
def test_swap_volume(self, get_guest, connect_volume, get_volume_config,
swap_volume, disconnect_volume):
conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI())
instance = objects.Instance(**self.test_instance)
old_connection_info = {'driver_volume_type': 'fake',
@ -15529,15 +15528,6 @@ class LibvirtConnTestCase(test.NoDBTestCase,
old_connection_info,
instance)
def test_swap_volume_driver_source_is_volume(self):
self._test_swap_volume_driver(source_type='volume')
def test_swap_volume_driver_source_is_image(self):
self._test_swap_volume_driver(source_type='image')
def test_swap_volume_driver_source_is_snapshot(self):
self._test_swap_volume_driver(source_type='snapshot')
@mock.patch('nova.virt.libvirt.guest.BlockDevice.rebase')
@mock.patch('nova.virt.libvirt.driver.LibvirtDriver._disconnect_volume')
@mock.patch('nova.virt.libvirt.driver.LibvirtDriver._connect_volume')