openstack
/
nova
Code Issues Proposed changes

Merge "Fix order of arguments in assertEqual"

This commit is contained in:
Jenkins 2015-09-10 13:19:38 +00:00 committed by Gerrit Code Review
parent 279c2b0a01 7db5128a86
commit b519516cad
10 changed files with 92 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/unit/virt/libvirt/storage/test_rbd.py
View File

@ -202,7 +202,7 @@ class RbdTestCase(test.NoDBTestCase):
client_stack[1].ioctx, str(self.volume_name)]
kwargs = {'features': client.features}
rbd.clone.assert_called_once_with(*args, **kwargs)
self.assertEqual(client.__enter__.call_count, 2)
self.assertEqual(2, client.__enter__.call_count)
@mock.patch.object(rbd_utils, 'RBDVolumeProxy')
def test_resize(self, mock_proxy):
@ -235,7 +235,7 @@ class RbdTestCase(test.NoDBTestCase):
self.assertTrue(self.mock_rados.Rados.connect.called)
self.assertTrue(self.mock_rados.Rados.open_ioctx.called)
self.assertIsInstance(ret[0], self.mock_rados.Rados)
self.assertEqual(ret[1], self.mock_rados.Rados.ioctx)
self.assertEqual(self.mock_rados.Rados.ioctx, ret[1])
self.mock_rados.Rados.open_ioctx.assert_called_with(self.rbd_pool)
@mock.patch.object(rbd_utils, 'rbd')
@ -245,7 +245,7 @@ class RbdTestCase(test.NoDBTestCase):
self.assertTrue(self.mock_rados.Rados.connect.called)
self.assertTrue(self.mock_rados.Rados.open_ioctx.called)
self.assertIsInstance(ret[0], self.mock_rados.Rados)
self.assertEqual(ret[1], self.mock_rados.Rados.ioctx)
self.assertEqual(self.mock_rados.Rados.ioctx, ret[1])
self.mock_rados.Rados.open_ioctx.assert_called_with('alt_pool')
@mock.patch.object(rbd_utils, 'rados')

18
nova/tests/unit/virt/libvirt/volume/test_glusterfs.py
View File

@ -41,7 +41,7 @@ class LibvirtGlusterfsVolumeDriverTestCase(
device_path = os.path.join(export_mnt_base,
connection_info['data']['name'])
self.assertEqual(device_path, connection_info['data']['device_path'])
self.assertEqual(connection_info['data']['device_path'], device_path)
expected_commands = [
('mkdir', '-p', export_mnt_base),
('mount', '-t', 'glusterfs', export_string, export_mnt_base),
@ -95,7 +95,7 @@ class LibvirtGlusterfsVolumeDriverTestCase(
('findmnt', '--target', export_mnt_base,
'--source', export_string),
('umount', export_mnt_base)]
self.assertEqual(self.executes, expected_commands)
self.assertEqual(expected_commands, self.executes)
@mock.patch.object(glusterfs.utils, 'execute')
@mock.patch.object(glusterfs.LOG, 'debug')
@ -135,7 +135,7 @@ class LibvirtGlusterfsVolumeDriverTestCase(
export_string, export_mnt_base),
('umount', export_mnt_base),
]
self.assertEqual(self.executes, expected_commands)
self.assertEqual(expected_commands, self.executes)
def test_libvirt_glusterfs_libgfapi(self):
self.flags(qemu_allowed_storage_drivers=['gluster'], group='libvirt')
@ -155,13 +155,13 @@ class LibvirtGlusterfsVolumeDriverTestCase(
libvirt_driver.connect_volume(connection_info, disk_info)
conf = libvirt_driver.get_config(connection_info, disk_info)
tree = conf.format_dom()
self.assertEqual(tree.get('type'), 'network')
self.assertEqual(tree.find('./driver').get('type'), 'raw')
self.assertEqual('network', tree.get('type'))
self.assertEqual('raw', tree.find('./driver').get('type'))
source = tree.find('./source')
self.assertEqual(source.get('protocol'), 'gluster')
self.assertEqual(source.get('name'), 'volume-00001/volume-00001')
self.assertEqual(source.find('./host').get('name'), '192.168.1.1')
self.assertEqual(source.find('./host').get('port'), '24007')
self.assertEqual('gluster', source.get('protocol'))
self.assertEqual('volume-00001/volume-00001', source.get('name'))
self.assertEqual('192.168.1.1', source.find('./host').get('name'))
self.assertEqual('24007', source.find('./host').get('port'))
libvirt_driver.disconnect_volume(connection_info, "vde")

2
nova/tests/unit/virt/libvirt/volume/test_iscsi.py
View File

@ -43,7 +43,7 @@ Setting up iSCSI targets: unused
driver = iscsi.LibvirtISCSIVolumeDriver("none")
out = driver.connector._get_target_portals_from_iscsiadm_output(
sample_input)
self.assertEqual(out, targets)
self.assertEqual(targets, out)
def test_libvirt_iscsi_driver(self, transport=None):
libvirt_driver = iscsi.LibvirtISCSIVolumeDriver(self.fake_conn)

48
nova/tests/unit/virt/libvirt/volume/test_net.py
View File

@ -28,16 +28,16 @@ class LibvirtNetVolumeDriverTestCase(
"""Tests the libvirt network volume driver."""
def _assertNetworkAndProtocolEquals(self, tree):
self.assertEqual(tree.get('type'), 'network')
self.assertEqual(tree.find('./source').get('protocol'), 'rbd')
self.assertEqual('network', tree.get('type'))
self.assertEqual('rbd', tree.find('./source').get('protocol'))
rbd_name = '%s/%s' % ('rbd', self.name)
self.assertEqual(tree.find('./source').get('name'), rbd_name)
self.assertEqual(rbd_name, tree.find('./source').get('name'))
def _assertISCSINetworkAndProtocolEquals(self, tree):
self.assertEqual(tree.get('type'), 'network')
self.assertEqual(tree.find('./source').get('protocol'), 'iscsi')
self.assertEqual('network', tree.get('type'))
self.assertEqual('iscsi', tree.find('./source').get('protocol'))
iscsi_name = '%s/%s' % (self.iqn, self.vol['id'])
self.assertEqual(tree.find('./source').get('name'), iscsi_name)
self.assertEqual(iscsi_name, tree.find('./source').get('name'))
def sheepdog_connection(self, volume):
return {
@ -52,9 +52,9 @@ class LibvirtNetVolumeDriverTestCase(
connection_info = self.sheepdog_connection(self.vol)
conf = libvirt_driver.get_config(connection_info, self.disk_info)
tree = conf.format_dom()
self.assertEqual(tree.get('type'), 'network')
self.assertEqual(tree.find('./source').get('protocol'), 'sheepdog')
self.assertEqual(tree.find('./source').get('name'), self.name)
self.assertEqual('network', tree.get('type'))
self.assertEqual('sheepdog', tree.find('./source').get('protocol'))
self.assertEqual(self.name, tree.find('./source').get('name'))
libvirt_driver.disconnect_volume(connection_info, "vde")
def rbd_connection(self, volume):
@ -96,8 +96,8 @@ class LibvirtNetVolumeDriverTestCase(
self._assertNetworkAndProtocolEquals(tree)
self.assertIsNone(tree.find('./source/auth'))
found_hosts = tree.findall('./source/host')
self.assertEqual([host.get('name') for host in found_hosts], hosts)
self.assertEqual([host.get('port') for host in found_hosts], ports)
self.assertEqual(hosts, [host.get('name') for host in found_hosts])
self.assertEqual(ports, [host.get('port') for host in found_hosts])
libvirt_driver.disconnect_volume(connection_info, "vde")
def test_libvirt_rbd_driver_auth_enabled(self):
@ -112,9 +112,9 @@ class LibvirtNetVolumeDriverTestCase(
conf = libvirt_driver.get_config(connection_info, self.disk_info)
tree = conf.format_dom()
self._assertNetworkAndProtocolEquals(tree)
self.assertEqual(tree.find('./auth').get('username'), self.user)
self.assertEqual(tree.find('./auth/secret').get('type'), secret_type)
self.assertEqual(tree.find('./auth/secret').get('uuid'), self.uuid)
self.assertEqual(self.user, tree.find('./auth').get('username'))
self.assertEqual(secret_type, tree.find('./auth/secret').get('type'))
self.assertEqual(self.uuid, tree.find('./auth/secret').get('uuid'))
libvirt_driver.disconnect_volume(connection_info, "vde")
def test_libvirt_rbd_driver_auth_enabled_flags_override(self):
@ -135,9 +135,9 @@ class LibvirtNetVolumeDriverTestCase(
conf = libvirt_driver.get_config(connection_info, self.disk_info)
tree = conf.format_dom()
self._assertNetworkAndProtocolEquals(tree)
self.assertEqual(tree.find('./auth').get('username'), flags_user)
self.assertEqual(tree.find('./auth/secret').get('type'), secret_type)
self.assertEqual(tree.find('./auth/secret').get('uuid'), flags_uuid)
self.assertEqual(flags_user, tree.find('./auth').get('username'))
self.assertEqual(secret_type, tree.find('./auth/secret').get('type'))
self.assertEqual(flags_uuid, tree.find('./auth/secret').get('uuid'))
libvirt_driver.disconnect_volume(connection_info, "vde")
def test_libvirt_rbd_driver_auth_disabled(self):
@ -175,9 +175,9 @@ class LibvirtNetVolumeDriverTestCase(
conf = libvirt_driver.get_config(connection_info, self.disk_info)
tree = conf.format_dom()
self._assertNetworkAndProtocolEquals(tree)
self.assertEqual(tree.find('./auth').get('username'), flags_user)
self.assertEqual(tree.find('./auth/secret').get('type'), secret_type)
self.assertEqual(tree.find('./auth/secret').get('uuid'), flags_uuid)
self.assertEqual(flags_user, tree.find('./auth').get('username'))
self.assertEqual(secret_type, tree.find('./auth/secret').get('type'))
self.assertEqual(flags_uuid, tree.find('./auth/secret').get('uuid'))
libvirt_driver.disconnect_volume(connection_info, "vde")
@mock.patch.object(host.Host, 'find_secret')
@ -195,8 +195,8 @@ class LibvirtNetVolumeDriverTestCase(
conf = libvirt_driver.get_config(connection_info, self.disk_info)
tree = conf.format_dom()
self._assertISCSINetworkAndProtocolEquals(tree)
self.assertEqual(tree.find('./auth').get('username'), flags_user)
self.assertEqual(tree.find('./auth/secret').get('type'), secret_type)
self.assertEqual(tree.find('./auth/secret').get('uuid'),
test_volume.SECRET_UUID)
self.assertEqual(flags_user, tree.find('./auth').get('username'))
self.assertEqual(secret_type, tree.find('./auth/secret').get('type'))
self.assertEqual(test_volume.SECRET_UUID,
tree.find('./auth/secret').get('uuid'))
libvirt_driver.disconnect_volume(connection_info, 'vde')

4
nova/tests/unit/virt/libvirt/volume/test_nfs.py
View File

@ -44,7 +44,7 @@ class LibvirtNFSVolumeDriverTestCase(test_volume.LibvirtVolumeBaseTestCase):
device_path = os.path.join(export_mnt_base,
connection_info['data']['name'])
self.assertEqual(device_path, connection_info['data']['device_path'])
self.assertEqual(connection_info['data']['device_path'], device_path)
expected_commands = [
('mkdir', '-p', export_mnt_base),
('mount', '-t', 'nfs', export_string, export_mnt_base),
@ -104,7 +104,7 @@ class LibvirtNFSVolumeDriverTestCase(test_volume.LibvirtVolumeBaseTestCase):
('findmnt', '--target', export_mnt_base, '--source',
export_string),
('umount', export_mnt_base)]
self.assertEqual(self.executes, expected_commands)
self.assertEqual(expected_commands, self.executes)
def test_libvirt_nfs_driver_with_opts(self):
libvirt_driver = nfs.LibvirtNFSVolumeDriver(self.fake_conn)

12
nova/tests/unit/virt/libvirt/volume/test_quobyte.py
View File

@ -313,8 +313,8 @@ class LibvirtQuobyteVolumeDriverTestCase(
libvirt_driver.connect_volume(connection_info, self.disk_info)
conf = libvirt_driver.get_config(connection_info, self.disk_info)
tree = conf.format_dom()
self.assertEqual(tree.get('type'), 'file')
self.assertEqual(tree.find('./driver').get('type'), 'qcow2')
self.assertEqual('file', tree.get('type'))
self.assertEqual('qcow2', tree.find('./driver').get('type'))
(mock_mount_volume.
assert_called_once_with('192.168.1.1/volume-00001',
@ -352,8 +352,8 @@ class LibvirtQuobyteVolumeDriverTestCase(
libvirt_driver = quobyte.LibvirtQuobyteVolumeDriver(self.fake_conn)
export_string = 'quobyte://192.168.1.1/volume-00001'
self.assertEqual(libvirt_driver._normalize_export(export_string),
"192.168.1.1/volume-00001")
self.assertEqual("192.168.1.1/volume-00001",
libvirt_driver._normalize_export(export_string))
def test_libvirt_quobyte_driver_normalize_export_without_protocol(self):
mnt_base = '/mnt'
@ -361,5 +361,5 @@ class LibvirtQuobyteVolumeDriverTestCase(
libvirt_driver = quobyte.LibvirtQuobyteVolumeDriver(self.fake_conn)
export_string = '192.168.1.1/volume-00001'
self.assertEqual(libvirt_driver._normalize_export(export_string),
"192.168.1.1/volume-00001")
self.assertEqual("192.168.1.1/volume-00001",
libvirt_driver._normalize_export(export_string))

3
nova/tests/unit/virt/libvirt/volume/test_scality.py
View File

@ -53,8 +53,7 @@ class LibvirtScalityVolumeDriverTestCase(
device_path = os.path.join(TEST_MOUNT,
TEST_CONN_INFO['data']['sofs_path'])
self.assertEqual(device_path,
TEST_CONN_INFO['data']['device_path'])
self.assertEqual(TEST_CONN_INFO['data']['device_path'], device_path)
conf = driver.get_config(TEST_CONN_INFO, self.disk_info)
tree = conf.format_dom()

12
nova/tests/unit/virt/libvirt/volume/test_volume.py
View File

@ -87,8 +87,8 @@ class LibvirtVolumeBaseTestCase(test.NoDBTestCase):
self.user = 'foo'
def _assertFileTypeEquals(self, tree, file_path):
self.assertEqual(tree.get('type'), 'file')
self.assertEqual(tree.find('./source').get('file'), file_path)
self.assertEqual('file', tree.get('type'))
self.assertEqual(file_path, tree.find('./source').get('file'))
class LibvirtISCSIVolumeBaseTestCase(LibvirtVolumeBaseTestCase):
@ -124,11 +124,9 @@ class LibvirtISCSIVolumeBaseTestCase(LibvirtVolumeBaseTestCase):
class LibvirtVolumeTestCase(LibvirtISCSIVolumeBaseTestCase):
def _assertDiskInfoEquals(self, tree, disk_info):
self.assertEqual(tree.get('device'), disk_info['type'])
self.assertEqual(tree.find('./target').get('bus'),
disk_info['bus'])
self.assertEqual(tree.find('./target').get('dev'),
disk_info['dev'])
self.assertEqual(disk_info['type'], tree.get('device'))
self.assertEqual(disk_info['bus'], tree.find('./target').get('bus'))
self.assertEqual(disk_info['dev'], tree.find('./target').get('dev'))
def _test_libvirt_volume_driver_disk_info(self):
libvirt_driver = volume.LibvirtVolumeDriver(self.fake_conn)

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

@ -309,7 +309,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
with mock.patch.object(greenthread, 'sleep'):
self.conn = driver.VMwareAPISession()
self.assertEqual(self.attempts, 2)
self.assertEqual(2, self.attempts)
def _get_instance_type_by_name(self, type):
for instance_type in test_flavors.DEFAULT_FLAVOR_OBJS:
@ -403,7 +403,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
"""
instances = self.conn.list_instances()
if uuidutils.is_uuid_like(uuid):
self.assertEqual(len(instances), num_instances)
self.assertEqual(num_instances, len(instances))
# Get Nova record for VM
vm_info = self._get_info()
@ -419,9 +419,8 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
self.assertEqual(vm.get("summary.config.memorySizeMB"),
self.type_data['memory_mb'])
self.assertEqual(
vm.get("config.hardware.device").VirtualDevice[2].obj_name,
"ns0:VirtualE1000")
self.assertEqual("ns0:VirtualE1000",
vm.get("config.hardware.device").VirtualDevice[2].obj_name)
if powered_on:
# Check that the VM is running according to Nova
self.assertEqual(power_state.RUNNING, vm_info.state)
@ -468,17 +467,17 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
def test_list_instances_1(self):
self._create_vm()
instances = self.conn.list_instances()
self.assertEqual(len(instances), 1)
self.assertEqual(1, len(instances))
def test_list_instance_uuids(self):
self._create_vm()
uuids = self.conn.list_instance_uuids()
self.assertEqual(len(uuids), 1)
self.assertEqual(1, len(uuids))
def test_list_instance_uuids_invalid_uuid(self):
self._create_vm(uuid='fake_id')
uuids = self.conn.list_instance_uuids()
self.assertEqual(len(uuids), 0)
self.assertEqual(0, len(uuids))
def _cached_files_exist(self, exists=True):
cache = ds_obj.DatastorePath(self.ds, 'vmware_base',
@ -597,7 +596,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
self.image['disk_format'] = 'iso'
self._create_vm()
self.assertEqual(self.iso_index, 2)
self.assertEqual(2, self.iso_index)
def test_ephemeral_disk_attach(self):
self._create_vm(ephemeral=50)
@ -1158,8 +1157,8 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
self.assertEqual('vmx-08', version)
def mock_upload_image(self, context, image, instance, session, **kwargs):
self.assertEqual(image, 'Test-Snapshot')
self.assertEqual(instance, self.instance)
self.assertEqual('Test-Snapshot', image)
self.assertEqual(self.instance, instance)
self.assertEqual(1024, kwargs['vmdk_size'])
def test_get_vm_ref_using_extra_config(self):
@ -1445,10 +1444,10 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
info = self._get_info()
self._check_vm_info(info, power_state.RUNNING)
instances = self.conn.list_instances()
self.assertEqual(len(instances), 1)
self.assertEqual(1, len(instances))
self.conn.destroy(self.context, self.instance, self.network_info)
instances = self.conn.list_instances()
self.assertEqual(len(instances), 0)
self.assertEqual(0, len(instances))
self.assertIsNone(vm_util.vm_ref_cache_get(self.uuid))
def test_destroy_no_datastore(self):
@ -1456,13 +1455,13 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
info = self._get_info()
self._check_vm_info(info, power_state.RUNNING)
instances = self.conn.list_instances()
self.assertEqual(len(instances), 1)
self.assertEqual(1, len(instances))
# Delete the vmPathName
vm = self._get_vm_record()
vm.delete('config.files.vmPathName')
self.conn.destroy(self.context, self.instance, self.network_info)
instances = self.conn.list_instances()
self.assertEqual(len(instances), 0)
self.assertEqual(0, len(instances))
def test_destroy_non_existent(self):
self.destroy_disks = True
@ -1644,10 +1643,10 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
connector_dict = self.conn.get_volume_connector(self.instance)
fake_vm = self._get_vm_record()
fake_vm_id = fake_vm.obj.value
self.assertEqual(connector_dict['ip'], 'test_url')
self.assertEqual(connector_dict['initiator'], 'iscsi-name')
self.assertEqual(connector_dict['host'], 'test_url')
self.assertEqual(connector_dict['instance'], fake_vm_id)
self.assertEqual('test_url', connector_dict['ip'])
self.assertEqual('iscsi-name', connector_dict['initiator'])
self.assertEqual('test_url', connector_dict['host'])
self.assertEqual(fake_vm_id, connector_dict['instance'])
def _test_vmdk_connection_info(self, type):
return {'driver_volume_type': type,
@ -1835,18 +1834,18 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
def test_connection_info_get(self):
self._create_vm()
connector = self.conn.get_volume_connector(self.instance)
self.assertEqual(connector['ip'], 'test_url')
self.assertEqual(connector['host'], 'test_url')
self.assertEqual(connector['initiator'], 'iscsi-name')
self.assertEqual('test_url', connector['ip'])
self.assertEqual('test_url', connector['host'])
self.assertEqual('iscsi-name', connector['initiator'])
self.assertIn('instance', connector)
def test_connection_info_get_after_destroy(self):
self._create_vm()
self.conn.destroy(self.context, self.instance, self.network_info)
connector = self.conn.get_volume_connector(self.instance)
self.assertEqual(connector['ip'], 'test_url')
self.assertEqual(connector['host'], 'test_url')
self.assertEqual(connector['initiator'], 'iscsi-name')
self.assertEqual('test_url', connector['ip'])
self.assertEqual('test_url', connector['host'])
self.assertEqual('iscsi-name', connector['initiator'])
self.assertNotIn('instance', connector)
def test_refresh_instance_security_rules(self):
@ -2014,17 +2013,18 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
def test_get_available_resource(self):
stats = self.conn.get_available_resource(self.node_name)
self.assertEqual(stats['vcpus'], 32)
self.assertEqual(stats['local_gb'], 1024)
self.assertEqual(stats['local_gb_used'], 1024 - 500)
self.assertEqual(stats['memory_mb'], 1000)
self.assertEqual(stats['memory_mb_used'], 500)
self.assertEqual(stats['hypervisor_type'], 'VMware vCenter Server')
self.assertEqual(stats['hypervisor_version'], 5001000)
self.assertEqual(stats['hypervisor_hostname'], self.node_name)
self.assertEqual(32, stats['vcpus'])
self.assertEqual(1024, stats['local_gb'])
self.assertEqual(1024 - 500, stats['local_gb_used'])
self.assertEqual(1000, stats['memory_mb'])
self.assertEqual(500, stats['memory_mb_used'])
self.assertEqual('VMware vCenter Server', stats['hypervisor_type'])
self.assertEqual(5001000, stats['hypervisor_version'])
self.assertEqual(self.node_name, stats['hypervisor_hostname'])
self.assertIsNone(stats['cpu_info'])
self.assertEqual(stats['supported_instances'],
'[["i686", "vmware", "hvm"], ["x86_64", "vmware", "hvm"]]')
self.assertEqual(
'[["i686", "vmware", "hvm"], ["x86_64", "vmware", "hvm"]]',
stats['supported_instances'])
def test_invalid_datastore_regex(self):
@ -2036,7 +2036,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
def test_get_available_nodes(self):
nodelist = self.conn.get_available_nodes()
self.assertEqual(len(nodelist), 1)
self.assertEqual(1, len(nodelist))
self.assertIn(self.node_name, nodelist)
@mock.patch.object(nova.virt.vmwareapi.images.VMwareImage,
@ -2112,7 +2112,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
if c.key == key and c.value == id:
found_iface_id = True
self.assertTrue(found_iface_id)
self.assertEqual(num_found, num_iface_ids)
self.assertEqual(num_iface_ids, num_found)
def _attach_interface(self, vif):
self.conn.attach_interface(self.instance, self.image, vif)

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

@ -81,7 +81,7 @@ class VMwareDSUtilDatastoreSelectionTestCase(test.NoDBTestCase):
capacity=0, freespace=0)
rec = ds_util._select_datastore(None, datastores, best_match)
self.assertEqual(rec, best_match)
self.assertEqual(best_match, rec)
def test_filter_datastores_no_match(self):
datastores = self.build_result_set(self.data)
@ -93,7 +93,7 @@ class VMwareDSUtilDatastoreSelectionTestCase(test.NoDBTestCase):
best_match,
datastore_regex)
self.assertEqual(rec, best_match, "did not match datastore properly")
self.assertEqual(best_match, rec, "did not match datastore properly")
def test_filter_datastores_specific_match(self):
@ -141,7 +141,7 @@ class VMwareDSUtilDatastoreSelectionTestCase(test.NoDBTestCase):
capacity=0, freespace=0)
rec = ds_util._select_datastore(None, datastores, best_match)
self.assertEqual(rec, best_match, "no matches were expected")
self.assertEqual(best_match, rec, "no matches were expected")
def test_filter_datastores_best_match(self):
data = [
@ -163,4 +163,4 @@ class VMwareDSUtilDatastoreSelectionTestCase(test.NoDBTestCase):
datastores,
best_match,
datastore_regex)
self.assertEqual(rec, best_match, "did not match datastore properly")
self.assertEqual(best_match, rec, "did not match datastore properly")