openstack/nova
Code Issues Proposed changes

Merge "Fix misuse of assertTrue"

Browse Source
This commit is contained in:
Jenkins
2017-02-15 01:48:22 +00:00
committed by Gerrit Code Review
parent d125358398 5b49f4dfd2
commit 880944b0e8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/unit/api/openstack/compute/test_hypervisors.py
View File

@@ -313,7 +313,7 @@ class HypervisorsTestV21(test.NoDBTestCase):
def _test(self, compute_node_get_all): def _test(self, compute_node_get_all):
req = self._get_request(True) req = self._get_request(True)
result = self.controller.index(req) result = self.controller.index(req)
self.assertTrue(1, len(result['hypervisors'])) self.assertEqual(1, len(result['hypervisors']))
expected = { expected = {
'id': compute_nodes[0].id, 'id': compute_nodes[0].id,
'hypervisor_hostname': compute_nodes[0].hypervisor_hostname, 'hypervisor_hostname': compute_nodes[0].hypervisor_hostname,
@@ -359,7 +359,7 @@ class HypervisorsTestV21(test.NoDBTestCase):
def _test(self, compute_node_get_all): def _test(self, compute_node_get_all):
req = self._get_request(True) req = self._get_request(True)
result = self.controller.detail(req) result = self.controller.detail(req)
self.assertTrue(1, len(result['hypervisors'])) self.assertEqual(1, len(result['hypervisors']))
expected = { expected = {
'id': compute_nodes[0].id, 'id': compute_nodes[0].id,
'hypervisor_hostname': compute_nodes[0].hypervisor_hostname, 'hypervisor_hostname': compute_nodes[0].hypervisor_hostname,

4
nova/tests/unit/objects/test_instance_device_metadata.py
View File

@@ -57,11 +57,11 @@ class _TestInstanceDeviceMetadata(object):
if isinstance(obj_meta, objects.NetworkInterfaceMetadata): if isinstance(obj_meta, objects.NetworkInterfaceMetadata):
self.assertEqual(obj_meta.mac, '52:54:00:f6:35:8f') self.assertEqual(obj_meta.mac, '52:54:00:f6:35:8f')
self.assertEqual(obj_meta.tags, ['mytag1']) self.assertEqual(obj_meta.tags, ['mytag1'])
self.assertTrue(obj_meta.bus, objects.PCIDeviceBus) self.assertIsInstance(obj_meta.bus, objects.PCIDeviceBus)
self.assertEqual(obj_meta.bus.address, '0000:00:03.0') self.assertEqual(obj_meta.bus.address, '0000:00:03.0')
self.assertEqual(obj_meta.vlan, 1000) self.assertEqual(obj_meta.vlan, 1000)
elif isinstance(obj_meta, objects.DiskMetadata): elif isinstance(obj_meta, objects.DiskMetadata):
self.assertTrue(obj_meta.bus, objects.PCIDeviceBus) self.assertIsInstance(obj_meta.bus, objects.PCIDeviceBus)
self.assertEqual(obj_meta.bus.address, '0000:00:09.0') self.assertEqual(obj_meta.bus.address, '0000:00:09.0')
self.assertEqual(obj_meta.tags, ['nfvfunc3']) self.assertEqual(obj_meta.tags, ['nfvfunc3'])

2
nova/tests/unit/scheduler/client/test_report.py
View File

@@ -519,7 +519,7 @@ class TestAggregates(SchedulerReportClientTestCase):
self.ks_sess_mock.get.assert_called_once_with( self.ks_sess_mock.get.assert_called_once_with(
expected_url, endpoint_filter=mock.ANY, raise_exc=False, expected_url, endpoint_filter=mock.ANY, raise_exc=False,
headers={'OpenStack-API-Version': 'placement 1.1'}) headers={'OpenStack-API-Version': 'placement 1.1'})
self.assertTrue(expected, result) self.assertEqual(expected, result)
@mock.patch.object(report.LOG, 'warning') @mock.patch.object(report.LOG, 'warning')
def test_get_provider_aggregates_not_found(self, log_mock): def test_get_provider_aggregates_not_found(self, log_mock):