openstack/nova
Code Issues Proposed changes

Merge "Stop using stubs.Set in vmwareapi unit tests"

Browse Source
This commit is contained in:
Jenkins 2016-02-02 15:07:15 +00:00 committed by Gerrit Code Review
commit 81b7ad306b
3 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/unit/virt/vmwareapi/test_configdrive.py
View File

@ -28,7 +28,6 @@ from nova.tests.unit.virt.vmwareapi import fake as vmwareapi_fake
from nova.tests.unit.virt.vmwareapi import stubs
from nova.virt import fake
from nova.virt.vmwareapi import driver
from nova.virt.vmwareapi import images
from nova.virt.vmwareapi import vm_util
from nova.virt.vmwareapi import vmops
@ -109,13 +108,12 @@ class ConfigDriveTestCase(test.NoDBTestCase):
pass
# We can't actually make a config drive v2 because ensure_tree has
# been faked out
self.stubs.Set(nova.virt.configdrive.ConfigDriveBuilder,
'make_drive', fake_make_drive)
self.stub_out('nova.virt.configdrive.ConfigDriveBuilder.make_drive',
fake_make_drive)
def fake_upload_iso_to_datastore(iso_path, instance, **kwargs):
pass
self.stubs.Set(images,
'upload_iso_to_datastore',
self.stub_out('nova.virt.vmwareapi.images.upload_iso_to_datastore',
fake_upload_iso_to_datastore)
def tearDown(self):

81
nova/tests/unit/virt/vmwareapi/test_driver_api.py
View File

@ -269,8 +269,10 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
def _fake_check_session(_self):
return True
self.stubs.Set(vmwareapi_fake.FakeVim, '_login', _fake_login)
self.stubs.Set(vmwareapi_fake.FakeVim, '_check_session',
self.stub_out('nova.tests.unit.virt.vmwareapi.fake.FakeVim._login',
_fake_login)
self.stub_out('nova.tests.unit.virt.vmwareapi.'
'fake.FakeVim._check_session',
_fake_check_session)
with mock.patch.object(greenthread, 'sleep'):
@ -517,7 +519,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
iso_uploaded_path):
self.assertEqual(iso_uploaded_path, str(iso_path))
self.stubs.Set(self.conn._vmops, "_attach_cdrom_to_vm",
self.stub_out('nova.virt.vmwareapi.vmops._attach_cdrom_to_vm',
fake_attach_cdrom)
self.image.disk_format = 'iso'
self._create_vm()
@ -542,24 +544,24 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
ds_obj.DatastorePath(self.ds, 'fake-config-drive')]
self.iso_index = 0
def fake_create_config_drive(instance, injected_files, password,
network_info, data_store_name,
folder, uuid, cookies):
return 'fake-config-drive'
def fake_attach_cdrom(vm_ref, instance, data_store_ref,
iso_uploaded_path):
self.assertEqual(iso_uploaded_path, str(iso_path[self.iso_index]))
self.iso_index += 1
self.stubs.Set(self.conn._vmops, "_attach_cdrom_to_vm",
fake_attach_cdrom)
self.stubs.Set(self.conn._vmops, '_create_config_drive',
fake_create_config_drive)
self.image.disk_format = 'iso'
self._create_vm()
self.assertEqual(2, self.iso_index)
with test.nested(
mock.patch.object(self.conn._vmops,
'_attach_cdrom_to_vm',
side_effect=fake_attach_cdrom),
mock.patch.object(self.conn._vmops,
'_create_config_drive',
return_value='fake-config-drive'),
) as (fake_attach_cdrom_to_vm, fake_create_config_drive):
self.image.disk_format = 'iso'
self._create_vm()
self.assertEqual(2, self.iso_index)
self.assertEqual(fake_attach_cdrom_to_vm.call_count, 2)
self.assertEqual(fake_create_config_drive.call_count, 1)
def test_ephemeral_disk_attach(self):
self._create_vm(ephemeral=50)
@ -596,24 +598,19 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
iso_path = ds_obj.DatastorePath(self.ds, 'fake-config-drive')
self.cd_attach_called = False
def fake_create_config_drive(instance, injected_files, password,
network_info, data_store_name,
folder, uuid, cookies):
return 'fake-config-drive'
def fake_attach_cdrom(vm_ref, instance, data_store_ref,
iso_uploaded_path):
self.assertEqual(iso_uploaded_path, str(iso_path))
self.cd_attach_called = True
self.stubs.Set(self.conn._vmops, "_attach_cdrom_to_vm",
fake_attach_cdrom)
self.stubs.Set(self.conn._vmops, '_create_config_drive',
fake_create_config_drive)
self._create_vm()
self.assertTrue(self.cd_attach_called)
with test.nested(
mock.patch.object(self.conn._vmops, '_attach_cdrom_to_vm',
side_effect=fake_attach_cdrom),
mock.patch.object(self.conn._vmops, '_create_config_drive',
return_value='fake-config-drive'),
) as (fake_attach_cdrom_to_vm, fake_create_config_drive):
self._create_vm()
self.assertTrue(self.cd_attach_called)
@mock.patch.object(vmops.VMwareVMOps, 'power_off')
@mock.patch.object(driver.VMwareVCDriver, 'detach_volume')
@ -778,13 +775,15 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
def _fake_extend(instance, requested_size, name, dc_ref):
vmwareapi_fake._add_file(str(root))
self.stubs.Set(self.conn._vmops, '_extend_virtual_disk',
_fake_extend)
self._create_vm()
info = self._get_info()
self._check_vm_info(info, power_state.RUNNING)
vmwareapi_fake.assertPathExists(self, str(root))
with test.nested(
mock.patch.object(self.conn._vmops, '_extend_virtual_disk',
side_effect=_fake_extend)
) as (fake_extend_virtual_disk):
self._create_vm()
info = self._get_info()
self._check_vm_info(info, power_state.RUNNING)
vmwareapi_fake.assertPathExists(self, str(root))
self.assertEqual(1, fake_extend_virtual_disk[0].call_count)
@mock.patch.object(nova.virt.vmwareapi.images.VMwareImage,
'from_image')
@ -1550,7 +1549,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
return str(ds_obj.DatastorePath(data_store_name,
instance_uuid, 'fake.iso'))
self.stubs.Set(self.conn._vmops, '_create_config_drive',
self.stub_out('nova.virt.vmwareapi.vmops._create_config_drive',
fake_create_config_drive)
self._create_vm()
@ -1561,9 +1560,10 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
info = self._get_info()
self._check_vm_info(info, power_state.RUNNING)
self.stubs.Set(vm_util, "power_on_instance",
self.stub_out('nova.virt.vmwareapi.vm_util.power_on_instance',
fake_power_on_instance)
self.stubs.Set(self.conn._volumeops, "attach_disk_to_vm",
self.stub_out('nova.virt.vmwareapi.volumeops.'
'VMwareVolumeOps.attach_disk_to_vm',
fake_attach_disk_to_vm)
self.conn.rescue(self.context, self.instance, self.network_info,
@ -1884,7 +1884,8 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
def _fake_get_timestamp_filename(fake):
return self._get_timestamp_filename()
self.stubs.Set(imagecache.ImageCacheManager, '_get_timestamp_filename',
self.stub_out('nova.virt.vmwareapi.imagecache.'
'ImageCacheManager._get_timestamp_filename',
_fake_get_timestamp_filename)
def _timestamp_file_exists(self, exists=True):

6
nova/tests/unit/virt/vmwareapi/test_network_util.py
View File

@ -38,8 +38,10 @@ class GetNetworkWithTheNameTestCase(test.NoDBTestCase):
def setUp(self):
super(GetNetworkWithTheNameTestCase, self).setUp()
fake.reset()
self.stubs.Set(driver.VMwareAPISession, "vim", stubs.fake_vim_prop)
self.stubs.Set(driver.VMwareAPISession, "_is_vim_object",
self.stub_out('nova.virt.vmwareapi.driver.VMwareAPISession.vim',
stubs.fake_vim_prop)
self.stub_out('nova.virt.vmwareapi.driver.'
'VMwareAPISession.is_vim_object',
stubs.fake_is_vim_object)
self._session = driver.VMwareAPISession()