openstack
/
nova
Code Issues Proposed changes

Merge "Change assertEqual(True/False) to assertTrue/False"

This commit is contained in:
Jenkins 2016-01-12 16:30:23 +00:00 committed by Gerrit Code Review
parent fb3a062cec 5b29231222
commit 20b9add302
24 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1608,7 +1608,7 @@ class ServersControllerDeleteTest(ControllerTest):
self.controller.delete(req, FAKE_UUID)
# delete() should be called for instance which has never been active,
# even if reclaim_instance_interval has been set.
self.assertEqual(True, self.server_delete_called)
self.assertTrue(self.server_delete_called)
class ServersControllerRebuildInstanceTest(ControllerTest):
@ -2543,7 +2543,7 @@ class ServersControllerCreateTest(test.TestCase):
old_create = compute_api.API.create
def create(*args, **kwargs):
self.assertEqual(False, kwargs['auto_disk_config'])
self.assertFalse(kwargs['auto_disk_config'])
return old_create(*args, **kwargs)
self.stubs.Set(compute_api.API, 'create', create)

6
nova/tests/unit/api/openstack/compute/test_cells.py
View File

@ -658,19 +658,19 @@ class CellsTestV21(BaseCellsTest):
self.controller.sync_instances(req, body=body)
self.assertIsNone(call_info['project_id'])
self.assertIsNone(call_info['updated_since'])
self.assertEqual(call_info['deleted'], False)
self.assertFalse(call_info['deleted'])
body = {'deleted': 'False'}
self.controller.sync_instances(req, body=body)
self.assertIsNone(call_info['project_id'])
self.assertIsNone(call_info['updated_since'])
self.assertEqual(call_info['deleted'], False)
self.assertFalse(call_info['deleted'])
body = {'deleted': 'True'}
self.controller.sync_instances(req, body=body)
self.assertIsNone(call_info['project_id'])
self.assertIsNone(call_info['updated_since'])
self.assertEqual(call_info['deleted'], True)
self.assertTrue(call_info['deleted'])
body = {'deleted': 'foo'}
self.assertRaises(self.bad_request,

6
nova/tests/unit/api/openstack/compute/test_disk_config.py
View File

@ -388,7 +388,7 @@ class DiskConfigTestCaseV21(test.TestCase):
def create(*args, **kwargs):
self.assertIn('auto_disk_config', kwargs)
self.assertEqual(True, kwargs['auto_disk_config'])
self.assertTrue(kwargs['auto_disk_config'])
return old_create(*args, **kwargs)
self.stubs.Set(compute_api.API, 'create', create)
@ -410,7 +410,7 @@ class DiskConfigTestCaseV21(test.TestCase):
def rebuild(*args, **kwargs):
self.assertIn('auto_disk_config', kwargs)
self.assertEqual(True, kwargs['auto_disk_config'])
self.assertTrue(kwargs['auto_disk_config'])
self.stubs.Set(compute_api.API, 'rebuild', rebuild)
@ -431,7 +431,7 @@ class DiskConfigTestCaseV21(test.TestCase):
def resize(*args, **kwargs):
self.assertIn('auto_disk_config', kwargs)
self.assertEqual(True, kwargs['auto_disk_config'])
self.assertTrue(kwargs['auto_disk_config'])
self.stubs.Set(compute_api.API, 'resize', resize)

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

@ -181,7 +181,7 @@ class FixedIpTestV21(test.NoDBTestCase):
result = action(req, "192.168.1.1", body=body)
self._assert_equal(result or action, 202)
self.assertEqual(fake_fixed_ips[0]['reserved'], True)
self.assertTrue(fake_fixed_ips[0]['reserved'])
def test_fixed_ip_reserve_bad_ip(self):
body = {'reserve': None}
@ -215,7 +215,7 @@ class FixedIpTestV21(test.NoDBTestCase):
result = action(req, "192.168.1.1", body=body)
self._assert_equal(result or action, 202)
self.assertEqual(fake_fixed_ips[0]['reserved'], False)
self.assertFalse(fake_fixed_ips[0]['reserved'])
def test_fixed_ip_unreserve_bad_ip(self):
body = {'unreserve': None}

8
nova/tests/unit/api/openstack/compute/test_server_actions.py
View File

@ -667,7 +667,7 @@ class ServerActionsControllerTestV21(test.TestCase):
self.controller._action_resize(self.req, FAKE_UUID, body=body)
self.assertEqual(self.resize_called, True)
self.assertTrue(self.resize_called)
def test_resize_server_no_flavor(self):
body = dict(resize=dict())
@ -822,7 +822,7 @@ class ServerActionsControllerTestV21(test.TestCase):
self.controller._action_confirm_resize(self.req, FAKE_UUID, body=body)
self.assertEqual(self.confirm_resize_called, True)
self.assertTrue(self.confirm_resize_called)
def test_confirm_resize_migration_not_found(self):
body = dict(confirmResize=None)
@ -889,7 +889,7 @@ class ServerActionsControllerTestV21(test.TestCase):
body = self.controller._action_revert_resize(self.req, FAKE_UUID,
body=body)
self.assertEqual(self.revert_resize_called, True)
self.assertTrue(self.revert_resize_called)
def test_revert_resize_raises_conflict_on_invalid_state(self):
body = dict(revertResize=None)
@ -1010,7 +1010,7 @@ class ServerActionsControllerTestV21(test.TestCase):
self.assertEqual(properties['kernel_id'], _fake_id('b'))
self.assertEqual(properties['ramdisk_id'], _fake_id('c'))
self.assertEqual(properties['root_device_name'], '/dev/vda')
self.assertEqual(properties['bdm_v2'], True)
self.assertTrue(properties['bdm_v2'])
bdms = properties['block_device_mapping']
self.assertEqual(len(bdms), 1)
self.assertEqual(bdms[0]['boot_index'], 0)

2
nova/tests/unit/api/openstack/compute/test_serversV21.py
View File

@ -1490,7 +1490,7 @@ class ServersControllerDeleteTest(ControllerTest):
self.controller.delete(req, FAKE_UUID)
# delete() should be called for instance which has never been active,
# even if reclaim_instance_interval has been set.
self.assertEqual(self.server_delete_called, True)
self.assertTrue(self.server_delete_called)
class ServersControllerRebuildInstanceTest(ControllerTest):

4
nova/tests/unit/cells/test_cells_manager.py
View File

@ -247,7 +247,7 @@ class CellsManagerClassTestCase(test.NoDBTestCase):
self.stubs.Set(timeutils, 'utcnow', utcnow)
self.cells_manager._heal_instances(fake_context)
self.assertEqual(True, call_info['shuffle'])
self.assertTrue(call_info['shuffle'])
self.assertIsNone(call_info['project_id'])
self.assertEqual(updated_since, call_info['updated_since'])
self.assertEqual(1, call_info['get_instances'])
@ -256,7 +256,7 @@ class CellsManagerClassTestCase(test.NoDBTestCase):
call_info['sync_instances'] = []
self.cells_manager._heal_instances(fake_context)
self.assertEqual(True, call_info['shuffle'])
self.assertTrue(call_info['shuffle'])
self.assertIsNone(call_info['project_id'])
self.assertEqual(updated_since, call_info['updated_since'])
self.assertEqual(2, call_info['get_instances'])

2
nova/tests/unit/compute/test_compute.py
View File

@ -5692,7 +5692,7 @@ class ComputeTestCase(BaseTestCase):
self.compute._post_live_migration(c, instance, dest,
migrate_data=migrate_data)
self.assertIn('cleanup', result)
self.assertEqual(result['cleanup'], True)
self.assertTrue(result['cleanup'])
def test_post_live_migration_working_correctly(self):
# Confirm post_live_migration() works as expected correctly.

8
nova/tests/unit/db/test_db_api.py
View File

@ -6459,8 +6459,8 @@ class NetworkTestCase(test.TestCase, ModelsObjectComparatorMixin):
'instance_uuid': instance['uuid'],
'virtual_interface_id': vif['id']}
db.fixed_ip_create(self.ctxt, values)
self.assertEqual(db.network_in_use_on_host(self.ctxt, 1, 'foo'), True)
self.assertEqual(db.network_in_use_on_host(self.ctxt, 1, 'bar'), False)
self.assertTrue(db.network_in_use_on_host(self.ctxt, 1, 'foo'))
self.assertFalse(db.network_in_use_on_host(self.ctxt, 1, 'bar'))
def test_network_update_nonexistent(self):
self.assertRaises(exception.NetworkNotFound,
@ -9252,9 +9252,9 @@ class TestDBInstanceTags(test.TestCase):
db.instance_tag_add(self.context, uuid, tag1)
# NOTE(snikitin): Make sure it's actually a bool
self.assertEqual(True, db.instance_tag_exists(self.context, uuid,
self.assertTrue(db.instance_tag_exists(self.context, uuid,
tag1))
self.assertEqual(False, db.instance_tag_exists(self.context, uuid,
self.assertFalse(db.instance_tag_exists(self.context, uuid,
tag2))
def test_instance_tag_add_to_non_existing_instance(self):

2
nova/tests/unit/objects/test_image_meta.py
View File

@ -113,7 +113,7 @@ class TestImageMetaProps(test.NoDBTestCase):
self.assertEqual('windows', virtprops.os_type)
self.assertEqual('vga', virtprops.hw_video_model)
self.assertEqual(512, virtprops.hw_video_ram)
self.assertEqual(True, virtprops.hw_qemu_guest_agent)
self.assertTrue(virtprops.hw_qemu_guest_agent)
def test_default_props(self):
props = {}

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

@ -26,14 +26,14 @@ class _TestLiveMigrateData(object):
def test_from_legacy_dict(self):
obj = migrate_data.LiveMigrateData()
obj.from_legacy_dict({'is_volume_backed': False, 'ignore': 'foo'})
self.assertEqual(False, obj.is_volume_backed)
self.assertFalse(obj.is_volume_backed)
def test_from_legacy_dict_migration(self):
migration = objects.Migration()
obj = migrate_data.LiveMigrateData()
obj.from_legacy_dict({'is_volume_backed': False, 'ignore': 'foo',
'migration': migration})
self.assertEqual(False, obj.is_volume_backed)
self.assertFalse(obj.is_volume_backed)
self.assertIsInstance(obj.migration, objects.Migration)
def test_legacy_with_pre_live_migration_result(self):

2
nova/tests/unit/objects/test_pci_device.py
View File

@ -237,7 +237,7 @@ class _TestPciDeviceObject(object):
self.pci_device.status = fields.PciDeviceStatus.DELETED
self.called = False
self.pci_device.save()
self.assertEqual(self.called, False)
self.assertFalse(self.called)
@mock.patch.object(objects.Service, 'get_minimum_version', return_value=4)
def test_save_migrate_parent_addr(self, get_min_ver_mock):

2
nova/tests/unit/objects/test_request_spec.py
View File

@ -288,7 +288,7 @@ class _TestRequestSpecObject(object):
mock_limits.assert_called_once_with({})
# Make sure that all fields are set using that helper method
for field in [f for f in spec.obj_fields if f != 'id']:
self.assertEqual(True, spec.obj_attr_is_set(field),
self.assertTrue(spec.obj_attr_is_set(field),
'Field: %s is not set' % field)
# just making sure that the context is set by the method
self.assertEqual(ctxt, spec._context)

2
nova/tests/unit/pci/test_manager.py
View File

@ -391,6 +391,6 @@ class PciGetInstanceDevs(test.TestCase):
self.load_attr_called = False
manager.get_instance_pci_devs(inst)
self.assertEqual(self.load_attr_called, True)
self.assertTrue(self.load_attr_called)
mock_instance_get.assert_called_with(self.fake_context, '1',
columns_to_join=[])

6
nova/tests/unit/pci/test_stats.py
View File

@ -162,19 +162,19 @@ class PciDeviceStatsTestCase(test.NoDBTestCase):
def test_support_requests_numa(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0),
objects.NUMACell(id=1, cpuset=set(), memory=0)]
self.assertEqual(True, self.pci_stats.support_requests(
self.assertTrue(self.pci_stats.support_requests(
pci_requests, cells))
def test_support_requests_numa_failed(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)]
self.assertEqual(False, self.pci_stats.support_requests(
self.assertFalse(self.pci_stats.support_requests(
pci_requests, cells))
def test_support_requests_no_numa_info(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)]
pci_request = [objects.InstancePCIRequest(count=1,
spec=[{'vendor_id': 'v3'}])]
self.assertEqual(True, self.pci_stats.support_requests(
self.assertTrue(self.pci_stats.support_requests(
pci_request, cells))
def test_consume_requests_numa(self):

4
nova/tests/unit/test_block_device.py
View File

@ -435,7 +435,7 @@ class TestBlockDeviceDict(test.NoDBTestCase):
'volume_id': 'fake-volume-id-1',
'boot_index': 0}
bdm_dict = block_device.BlockDeviceDict(bdm)
self.assertEqual(False, bdm_dict['delete_on_termination'])
self.assertFalse(bdm_dict['delete_on_termination'])
def test_validate(self):
self.assertRaises(exception.InvalidBDMFormat,
@ -477,7 +477,7 @@ class TestBlockDeviceDict(test.NoDBTestCase):
truthy_bdm = dict(self.new_mapping[2])
truthy_bdm['delete_on_termination'] = '1'
truthy_bdm = block_device.BlockDeviceDict(truthy_bdm)
self.assertEqual(True, truthy_bdm['delete_on_termination'])
self.assertTrue(truthy_bdm['delete_on_termination'])
verbose_bdm = dict(self.new_mapping[2])
verbose_bdm['boot_index'] = 'first'

6
nova/tests/unit/test_context.py
View File

@ -40,19 +40,19 @@ class ContextTestCase(test.NoDBTestCase):
ctxt = context.RequestContext('111',
'222',
roles=['admin', 'weasel'])
self.assertEqual(True, ctxt.is_admin)
self.assertTrue(ctxt.is_admin)
def test_request_context_sets_is_admin_by_role(self):
ctxt = context.RequestContext('111',
'222',
roles=['administrator'])
self.assertEqual(True, ctxt.is_admin)
self.assertTrue(ctxt.is_admin)
def test_request_context_sets_is_admin_upcase(self):
ctxt = context.RequestContext('111',
'222',
roles=['Admin', 'weasel'])
self.assertEqual(True, ctxt.is_admin)
self.assertTrue(ctxt.is_admin)
def test_request_context_read_deleted(self):
ctxt = context.RequestContext('111',

4
nova/tests/unit/test_fixtures.py
View File

@ -64,10 +64,10 @@ class TestConfFixture(testtools.TestCase):
"""
def _test_override(self):
self.assertEqual('api-paste.ini', CONF.api_paste_config)
self.assertEqual(False, CONF.fake_network)
self.assertFalse(CONF.fake_network)
self.useFixture(conf_fixture.ConfFixture())
CONF.set_default('api_paste_config', 'foo')
self.assertEqual(True, CONF.fake_network)
self.assertTrue(CONF.fake_network)
def test_override1(self):
self._test_override()

6
nova/tests/unit/test_nova_manage.py
View File

@ -43,7 +43,7 @@ class FixedIpCommandsTestCase(test.TestCase):
self.commands.reserve('192.168.0.100')
address = db.fixed_ip_get_by_address(context.get_admin_context(),
'192.168.0.100')
self.assertEqual(address['reserved'], True)
self.assertTrue(address['reserved'])
def test_reserve_nonexistent_address(self):
self.assertEqual(2, self.commands.reserve('55.55.55.55'))
@ -52,7 +52,7 @@ class FixedIpCommandsTestCase(test.TestCase):
self.commands.unreserve('192.168.0.100')
address = db.fixed_ip_get_by_address(context.get_admin_context(),
'192.168.0.100')
self.assertEqual(address['reserved'], False)
self.assertFalse(address['reserved'])
def test_unreserve_nonexistent_address(self):
self.assertEqual(2, self.commands.unreserve('55.55.55.55'))
@ -172,7 +172,7 @@ class NetworkCommandsTestCase(test.TestCase):
self.assertTrue(context.to_dict()['is_admin'])
self.assertEqual(kwargs['label'], 'Test')
self.assertEqual(kwargs['cidr'], '10.2.0.0/24')
self.assertEqual(kwargs['multi_host'], False)
self.assertFalse(kwargs['multi_host'])
self.assertEqual(kwargs['num_networks'], 1)
self.assertEqual(kwargs['network_size'], 256)
self.assertEqual(kwargs['vlan'], 200)

10
nova/tests/unit/test_policy.py
View File

@ -92,12 +92,12 @@ class PolicyTestCase(test.NoDBTestCase):
def test_enforce_bad_action_noraise(self):
action = "example:denied"
result = policy.enforce(self.context, action, self.target, False)
self.assertEqual(result, False)
self.assertFalse(result)
def test_enforce_good_action(self):
action = "example:allowed"
result = policy.enforce(self.context, action, self.target)
self.assertEqual(result, True)
self.assertTrue(result)
@requests_mock.mock()
def test_enforce_http_true(self, req_mock):
@ -106,7 +106,7 @@ class PolicyTestCase(test.NoDBTestCase):
action = "example:get_http"
target = {}
result = policy.enforce(self.context, action, target)
self.assertEqual(result, True)
self.assertTrue(result)
@requests_mock.mock()
def test_enforce_http_false(self, req_mock):
@ -188,14 +188,14 @@ class IsAdminCheckTestCase(test.NoDBTestCase):
self.assertEqual(check.kind, 'is_admin')
self.assertEqual(check.match, 'True')
self.assertEqual(check.expected, True)
self.assertTrue(check.expected)
def test_init_false(self):
check = policy.IsAdminCheck('is_admin', 'nottrue')
self.assertEqual(check.kind, 'is_admin')
self.assertEqual(check.match, 'False')
self.assertEqual(check.expected, False)
self.assertFalse(check.expected)
def test_call_true(self):
check = policy.IsAdminCheck('is_admin', 'True')

2
nova/tests/unit/test_quota.py
View File

@ -2339,7 +2339,7 @@ class DbQuotaDriverTestCase(test.TestCase):
elevated = calls[0][1]
self.assertEqual(elevated.project_id, ctx.project_id)
self.assertEqual(elevated.quota_class, ctx.quota_class)
self.assertEqual(elevated.is_admin, True)
self.assertTrue(elevated.is_admin)
# Now check that all the expected calls were made
exemplar = [('quota_usage_update', elevated, 'test_project',

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

@ -9486,7 +9486,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
conn.suspend(self.context, instance)
mock_managedSave.assert_called_once_with(0)
self.assertEqual(mock_get_instance_disk_info.called, False)
self.assertFalse(mock_get_instance_disk_info.called)
mock_delete_volume.assert_has_calls([mock.call(disk['path'])
for disk in mock_get_instance_disk_info.return_value], False)
@ -14683,7 +14683,7 @@ class LibvirtNonblockingTestCase(test.NoDBTestCase):
driver = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
c = driver._get_connection()
self.assertEqual(True, c.is_expected)
self.assertTrue(c.is_expected)
class LibvirtVolumeSnapshotTestCase(test.NoDBTestCase):

4
nova/tests/unit/virt/xenapi/image/test_utils.py
View File

@ -50,7 +50,7 @@ class GlanceImageTestCase(test.NoDBTestCase):
mocked.get.return_value = {}
image = self._get_image()
self.assertEqual(False, image.is_raw_tgz())
self.assertFalse(image.is_raw_tgz())
def test_is_raw_tgz_for_raw_tgz(self, mocked):
mocked.get.return_value = {
@ -59,7 +59,7 @@ class GlanceImageTestCase(test.NoDBTestCase):
}
image = self._get_image()
self.assertEqual(True, image.is_raw_tgz())
self.assertTrue(image.is_raw_tgz())
def test_data(self, mocked):
mocked.download.return_value = mock.sentinel.image

10
nova/tests/unit/virt/xenapi/test_xenapi.py
View File

@ -1780,11 +1780,11 @@ class XenAPIMigrateInstance(stubs.XenAPITestBase):
dict(base_copy=base_uuid, cow=cow_uuid),
network_info, image_meta, resize_instance=True,
block_device_info=None, power_on=power_on)
self.assertEqual(self.called, True)
self.assertTrue(self.called)
self.assertEqual(self.fake_vm_start_called, power_on)
conn.finish_revert_migration(context, instance, network_info)
self.assertEqual(self.fake_finish_revert_migration_called, True)
self.assertTrue(self.fake_finish_revert_migration_called)
def test_revert_migrate_power_on(self):
self._test_revert_migrate(True)
@ -1818,7 +1818,7 @@ class XenAPIMigrateInstance(stubs.XenAPITestBase):
dict(base_copy='hurr', cow='durr'),
network_info, image_meta, resize_instance=True,
block_device_info=None, power_on=power_on)
self.assertEqual(self.called, True)
self.assertTrue(self.called)
self.assertEqual(self.fake_vm_start_called, power_on)
def test_finish_migrate_power_on(self):
@ -2182,7 +2182,7 @@ class XenAPIHostTestCase(stubs.XenAPITestBase):
True, 'enabled')
service = db.service_get_by_host_and_binary(self.context, 'fake-mini',
'nova-compute')
self.assertEqual(service.disabled, False)
self.assertFalse(service.disabled)
def test_set_enable_host_disable(self):
_create_service_entries(self.context, values={'nova': ['fake-mini']})
@ -2190,7 +2190,7 @@ class XenAPIHostTestCase(stubs.XenAPITestBase):
False, 'disabled')
service = db.service_get_by_host_and_binary(self.context, 'fake-mini',
'nova-compute')
self.assertEqual(service.disabled, True)
self.assertTrue(service.disabled)
def test_get_host_uptime(self):
result = self.conn.get_host_uptime()