openstack
/
nova
Code Issues Proposed changes

Use assertGreater(A, X) instead of assertTrue(A > X) 

Instead of using assertTrue(A > X), developers should
use assertGreater(A, X).

TrivialFix

Change-Id: I219aa46b7e16df2af9763b02c9822869de544ab2
This commit is contained in:
Alex Szarka 2016-04-07 14:40:38 +02:00 committed by Stephen Finucane
parent 11e23346b5
commit e34fd54904
16 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,8 +101,8 @@ class KeypairsTestV21(test.TestCase):
def test_keypair_create(self):
body = {'keypair': {'name': 'create_test'}}
res_dict = self.controller.create(self.req, body=body)
self.assertTrue(len(res_dict['keypair']['fingerprint']) > 0)
self.assertTrue(len(res_dict['keypair']['private_key']) > 0)
self.assertGreater(len(res_dict['keypair']['fingerprint']), 0)
self.assertGreater(len(res_dict['keypair']['private_key']), 0)
self._assert_keypair_type(res_dict)
def _test_keypair_create_bad_request_case(self,
@ -182,7 +182,7 @@ class KeypairsTestV21(test.TestCase):
}
res_dict = self.controller.create(self.req, body=body)
# FIXME(ja): sholud we check that public_key was sent to create?
self.assertTrue(len(res_dict['keypair']['fingerprint']) > 0)
self.assertGreater(len(res_dict['keypair']['fingerprint']), 0)
self.assertNotIn('private_key', res_dict['keypair'])
self._assert_keypair_type(res_dict)

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

@ -403,7 +403,7 @@ class MultiCreateExtensionTestV21(test.TestCase):
reservation_id = res.obj['reservation_id']
self.assertNotEqual(reservation_id, "")
self.assertIsNotNone(reservation_id)
self.assertTrue(len(reservation_id) > 1)
self.assertGreater(len(reservation_id), 1)
def test_create_multiple_instances_with_resv_id_return(self):
self._create_multiple_instances_resv_id_return(True)

8
nova/tests/unit/api/openstack/test_api_version_request.py
View File

@ -84,10 +84,10 @@ class APIVersionRequestTests(test.NoDBTestCase):
self.assertTrue(vers1 < vers2)
self.assertTrue(vers1 <= vers2)
self.assertTrue(vers1 <= vers4)
self.assertTrue(vers2 > v_null)
self.assertTrue(vers3 > vers2)
self.assertTrue(vers1 >= vers4)
self.assertTrue(vers3 >= vers2)
self.assertGreater(vers2, v_null)
self.assertGreater(vers3, vers2)
self.assertGreaterEqual(vers1, vers4)
self.assertGreaterEqual(vers3, vers2)
self.assertTrue(vers1 != vers2)
self.assertTrue(vers1 == vers4)
self.assertTrue(vers1 != v_null)

2
nova/tests/unit/cells/test_cells_weights.py
View File

@ -66,7 +66,7 @@ class CellsWeightsTestCase(test.NoDBTestCase):
def test_all_weighers(self):
weighers = weights.all_weighers()
# Check at least a couple that we expect are there
self.assertTrue(len(weighers) >= 2)
self.assertGreaterEqual(len(weighers), 2)
class_names = [cls.__name__ for cls in weighers]
self.assertIn('WeightOffsetWeigher', class_names)
self.assertIn('RamByInstanceTypeWeigher', class_names)

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

@ -1981,7 +1981,8 @@ class ComputeTestCase(BaseTestCase):
self.compute.build_and_run_instance(self.context, instance, {}, {}, {},
block_device_mapping=[])
instance.refresh()
self.assertTrue(instance['launched_at'].replace(tzinfo=None) > launch)
self.assertGreater(instance['launched_at'].replace(tzinfo=None),
launch)
self.assertIsNone(instance['deleted_at'])
terminate = timeutils.utcnow()
self.compute.terminate_instance(self.context, instance, [], [])
@ -1991,8 +1992,8 @@ class ComputeTestCase(BaseTestCase):
instance['uuid'])
self.assertTrue(instance['launched_at'].replace(
tzinfo=None) < terminate)
self.assertTrue(instance['deleted_at'].replace(
tzinfo=None) > terminate)
self.assertGreater(instance['deleted_at'].replace(
tzinfo=None), terminate)
def test_run_terminate_deallocate_net_failure_sets_error_state(self):
instance = self._create_fake_instance_obj()
@ -3885,7 +3886,7 @@ class ComputeTestCase(BaseTestCase):
self.compute.build_and_run_instance(self.context, instance, {}, {}, {},
block_device_mapping=[])
self.assertTrue(len(fake_notifier.NOTIFICATIONS) >= 2)
self.assertGreaterEqual(len(fake_notifier.NOTIFICATIONS), 2)
msg = fake_notifier.NOTIFICATIONS[0]
self.assertEqual(msg.event_type, 'compute.instance.create.start')
msg = fake_notifier.NOTIFICATIONS[-1]
@ -3911,7 +3912,7 @@ class ComputeTestCase(BaseTestCase):
self.compute.build_and_run_instance(self.context, instance, {}, {}, {},
block_device_mapping=[])
self.assertTrue(len(fake_notifier.NOTIFICATIONS) >= 2)
self.assertGreaterEqual(len(fake_notifier.NOTIFICATIONS), 2)
msg = fake_notifier.NOTIFICATIONS[0]
self.assertEqual(msg.event_type, 'compute.instance.create.start')
msg = fake_notifier.NOTIFICATIONS[-1]
@ -3935,7 +3936,7 @@ class ComputeTestCase(BaseTestCase):
self.compute.build_and_run_instance(
self.context, instance, {}, {}, {}, block_device_mapping=[])
self.assertTrue(len(fake_notifier.NOTIFICATIONS) >= 2)
self.assertGreaterEqual(len(fake_notifier.NOTIFICATIONS), 2)
msg = fake_notifier.NOTIFICATIONS[0]
self.assertEqual(msg.event_type, 'compute.instance.create.start')
msg = fake_notifier.NOTIFICATIONS[-1]

2
nova/tests/unit/db/test_migrations.py
View File

@ -910,7 +910,7 @@ class TestNovaMigrationsMySQL(NovaMigrationsCheckers,
"FROM information_schema.TABLES "
"WHERE TABLE_SCHEMA = '%(database)s'" %
{'database': self.migrate_engine.url.database})
self.assertTrue(total.scalar() > 0, "No tables found. Wrong schema?")
self.assertGreater(total.scalar(), 0, "No tables found. Wrong schema?")
noninnodb = self.migrate_engine.execute(
"SELECT count(*) "

4
nova/tests/unit/network/test_linux_net.py
View File

@ -577,7 +577,7 @@ class LinuxNetworkTestCase(test.NoDBTestCase):
data = get_associated(self.context, 0, address=lease[2])[0]
self.assertTrue(data['allocated'])
self.assertTrue(data['leased'])
self.assertTrue(int(lease[0]) > seconds_since_epoch)
self.assertGreater(int(lease[0]), seconds_since_epoch)
self.assertEqual(data['vif_address'], lease[1])
self.assertEqual(data['address'], lease[2])
self.assertEqual(data['instance_hostname'], lease[3])
@ -594,7 +594,7 @@ class LinuxNetworkTestCase(test.NoDBTestCase):
lease = lease.split(' ')
data = get_associated(self.context, 1, address=lease[2])[0]
self.assertTrue(data['leased'])
self.assertTrue(int(lease[0]) > seconds_since_epoch)
self.assertGreater(int(lease[0]), seconds_since_epoch)
self.assertEqual(data['vif_address'], lease[1])
self.assertEqual(data['address'], lease[2])
self.assertEqual(data['instance_hostname'], lease[3])

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

@ -81,7 +81,7 @@ class _TestBlockDeviceMappingObject(object):
self.assertFalse(cells_update_mock.called)
else:
self.assertEqual(1, cells_update_mock.call_count)
self.assertTrue(len(cells_update_mock.call_args[0]) > 1)
self.assertGreater(len(cells_update_mock.call_args[0]), 1)
self.assertIsInstance(cells_update_mock.call_args[0][1],
block_device_obj.BlockDeviceMapping)
self.assertEqual({'create': create},
@ -249,7 +249,7 @@ class _TestBlockDeviceMappingObject(object):
self.context, values, legacy=False)
if cell_type == 'compute' and 'device_name' in values:
self.assertEqual(1, cells_update_mock.call_count)
self.assertTrue(len(cells_update_mock.call_args[0]) > 1)
self.assertGreater(len(cells_update_mock.call_args[0]), 1)
self.assertEqual(self.context,
cells_update_mock.call_args[0][0])
self.assertIsInstance(cells_update_mock.call_args[0][1],

2
nova/tests/unit/scheduler/test_filter_scheduler.py
View File

@ -328,7 +328,7 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
except exception.NoValidHost as e:
# Make sure that we provided a reason why NoValidHost.
self.assertIn('reason', e.kwargs)
self.assertTrue(len(e.kwargs['reason']) > 0)
self.assertGreater(len(e.kwargs['reason']), 0)
# Make sure that the consumed hosts have chance to be reverted.
for host in consumed_hosts:
self.assertIsNone(host.obj.updated)

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

@ -236,7 +236,7 @@ class IptablesManagerTestCase(test.NoDBTestCase):
self.assertIn(line, new_lines, "One of iptables key lines "
"went missing.")
self.assertTrue(len(new_lines) > 4, "No iptables rules added")
self.assertGreater(len(new_lines), 4, "No iptables rules added")
self.assertTrue("#Generated by nova" == new_lines[0] and
"*filter" == new_lines[1] and

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

@ -799,7 +799,7 @@ class LastBytesTestCase(test.NoDBTestCase):
self.f.seek(0, os.SEEK_SET)
out, remaining = utils.last_bytes(self.f, 5)
self.assertEqual(out, b'67890')
self.assertTrue(remaining > 0)
self.assertGreater(remaining, 0)
def test_read_all(self):
self.f.seek(0, os.SEEK_SET)

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

@ -5875,7 +5875,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
'%s failed common check %d' % (xml, i))
target = tree.find('./devices/filesystem/source').get('dir')
self.assertTrue(len(target) > 0)
self.assertGreater(len(target), 0)
def _check_xml_and_disk_prefix(self, instance, prefix):
instance_ref = objects.Instance(**instance)
@ -7751,7 +7751,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
def fake_job_info(hostself):
while True:
self.assertTrue(len(job_info_records) > 0)
self.assertGreater(len(job_info_records), 0)
rec = job_info_records.pop(0)
if type(rec) == str:

21
nova/tests/unit/virt/libvirt/test_firewall.py
View File

@ -281,30 +281,31 @@ class IptablesFirewallTestCase(test.NoDBTestCase):
regex = re.compile('\[0\:0\] -A .* -j ACCEPT -p icmp '
'-s 192.168.11.0/24')
self.assertTrue(len(filter(regex.match, self.out_rules)) > 0,
"ICMP acceptance rule wasn't added")
self.assertGreater(len(filter(regex.match, self.out_rules)), 0,
"ICMP acceptance rule wasn't added")
regex = re.compile('\[0\:0\] -A .* -j ACCEPT -p icmp -m icmp '
'--icmp-type 8 -s 192.168.11.0/24')
self.assertTrue(len(filter(regex.match, self.out_rules)) > 0,
"ICMP Echo Request acceptance rule wasn't added")
self.assertGreater(len(filter(regex.match, self.out_rules)), 0,
"ICMP Echo Request acceptance rule wasn't added")
for ip in network_model.fixed_ips():
if ip['version'] != 4:
continue
regex = re.compile('\[0\:0\] -A .* -j ACCEPT -p tcp -m multiport '
'--dports 80:81 -s %s' % ip['address'])
self.assertTrue(len(filter(regex.match, self.out_rules)) > 0,
"TCP port 80/81 acceptance rule wasn't added")
self.assertGreater(len(filter(regex.match, self.out_rules)), 0,
"TCP port 80/81 acceptance rule wasn't added")
regex = re.compile('\[0\:0\] -A .* -j ACCEPT -s '
'%s' % ip['address'])
self.assertTrue(len(filter(regex.match, self.out_rules)) > 0,
"Protocol/port-less acceptance rule wasn't added")
self.assertGreater(len(filter(regex.match, self.out_rules)), 0,
"Protocol/port-less acceptance rule"
" wasn't added")
regex = re.compile('\[0\:0\] -A .* -j ACCEPT -p tcp '
'-m multiport --dports 80:81 -s 192.168.10.0/24')
self.assertTrue(len(filter(regex.match, self.out_rules)) > 0,
"TCP port 80/81 acceptance rule wasn't added")
self.assertGreater(len(filter(regex.match, self.out_rules)), 0,
"TCP port 80/81 acceptance rule wasn't added")
def test_filters_for_instance_with_ip_v6(self):
self.flags(use_ipv6=True)

6
nova/tests/unit/virt/test_hardware.py
View File

@ -2076,9 +2076,9 @@ class _CPUPinningTestCaseBase(object):
pins_per_sib = collections.defaultdict(int)
for inst_p, host_p in instance_cell.cpu_pinning.items():
pins_per_sib[cpu_to_sib[host_p]] += 1
self.assertTrue(max(pins_per_sib.values()) > 1,
"Seems threads were not preferred by the pinning "
"logic.")
self.assertGreater(max(pins_per_sib.values()), 1,
"Seems threads were not preferred by the "
"pinning logic.")
class CPUPinningCellTestCase(test.NoDBTestCase, _CPUPinningTestCaseBase):

2
nova/tests/unit/virt/vmwareapi/test_vmops.py
View File

@ -1527,7 +1527,7 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
self._ds.name,
upload_file_name,
cookies='Fake-CookieJar')
self.assertTrue(len(_wait_for_task.mock_calls) > 0)
self.assertGreater(len(_wait_for_task.mock_calls), 0)
_get_inventory_path.call_count = 1
extras = None
if block_device_info and ('ephemerals' in block_device_info or

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

@ -2733,18 +2733,18 @@ class XenAPIDom0IptablesFirewallTestCase(stubs.XenAPITestBase):
regex = re.compile('\[0\:0\] -A .* -j ACCEPT -p icmp'
' -s 192.168.11.0/24')
self.assertTrue(len(filter(regex.match, self._out_rules)) > 0,
"ICMP acceptance rule wasn't added")
self.assertGreater(len(filter(regex.match, self._out_rules)), 0,
"ICMP acceptance rule wasn't added")
regex = re.compile('\[0\:0\] -A .* -j ACCEPT -p icmp -m icmp'
' --icmp-type 8 -s 192.168.11.0/24')
self.assertTrue(len(filter(regex.match, self._out_rules)) > 0,
"ICMP Echo Request acceptance rule wasn't added")
self.assertGreater(len(filter(regex.match, self._out_rules)), 0,
"ICMP Echo Request acceptance rule wasn't added")
regex = re.compile('\[0\:0\] -A .* -j ACCEPT -p tcp --dport 80:81'
' -s 192.168.10.0/24')
self.assertTrue(len(filter(regex.match, self._out_rules)) > 0,
"TCP port 80/81 acceptance rule wasn't added")
self.assertGreater(len(filter(regex.match, self._out_rules)), 0,
"TCP port 80/81 acceptance rule wasn't added")
def test_static_filters(self):
instance_ref = self._create_instance_ref()
@ -2787,8 +2787,8 @@ class XenAPIDom0IptablesFirewallTestCase(stubs.XenAPITestBase):
continue
regex = re.compile('\[0\:0\] -A .* -j ACCEPT -p tcp'
' --dport 80:81 -s %s' % ip['address'])
self.assertTrue(len(filter(regex.match, self._out_rules)) > 0,
"TCP port 80/81 acceptance rule wasn't added")
self.assertGreater(len(filter(regex.match, self._out_rules)), 0,
"TCP port 80/81 acceptance rule wasn't added")
db.instance_destroy(admin_ctxt, instance_ref['uuid'])
@ -2857,9 +2857,9 @@ class XenAPIDom0IptablesFirewallTestCase(stubs.XenAPITestBase):
self.fw.refresh_security_group_rules(secgroup)
regex = re.compile('\[0\:0\] -A .* -j ACCEPT -p udp --dport 200:299'
' -s 192.168.99.0/24')
self.assertTrue(len(filter(regex.match, self._out_rules)) > 0,
"Rules were not updated properly. "
"The rule for UDP acceptance is missing")
self.assertGreater(len(filter(regex.match, self._out_rules)), 0,
"Rules were not updated properly. "
"The rule for UDP acceptance is missing")
class XenAPISRSelectionTestCase(stubs.XenAPITestBaseNoDB):