openstack
/
nova
Code Issues Proposed changes

Utilizes assertIn - tests/api/contrib 

Using assertTrue and the 'in' operator to test
if an element is in a sequence is too python2.4.
Our unit testing framework supports assertIn,
which was created for these types of tests.
Adapting assertIn will enhance the readability of the test scripts.

Change-Id: Id2237b7a35c5c759e571b138faa8d1bef46a7e27
This commit is contained in:
Zhongyue Luo 2013-10-12 10:57:17 +08:00
parent 8d8798efff
commit b2ce40322f
21 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/api/openstack/compute/contrib/test_availability_zone.py
View File

@ -108,7 +108,7 @@ class AvailabilityZoneApiTest(test.NoDBTestCase):
self.assertEqual(resp.status_int, 200)
resp_dict = jsonutils.loads(resp.body)
self.assertTrue('availabilityZoneInfo' in resp_dict)
self.assertIn('availabilityZoneInfo', resp_dict)
zones = resp_dict['availabilityZoneInfo']
self.assertEqual(len(zones), 2)
self.assertEqual(zones[0]['zoneName'], u'zone-1')
@ -156,7 +156,7 @@ class AvailabilityZoneApiTest(test.NoDBTestCase):
req.environ['nova.context'] = context.get_admin_context()
resp_dict = availabilityZone.detail(req)
self.assertTrue('availabilityZoneInfo' in resp_dict)
self.assertIn('availabilityZoneInfo', resp_dict)
zones = resp_dict['availabilityZoneInfo']
self.assertEqual(len(zones), 3)
@ -234,10 +234,10 @@ class AvailabilityZoneSerializerTest(test.NoDBTestCase):
tree[0].get('available'))
for _idx, host_child in enumerate(tree[1]):
self.assertTrue(host_child.get('name') in zone_dict['hosts'])
self.assertIn(host_child.get('name'), zone_dict['hosts'])
svcs = zone_dict['hosts'][host_child.get('name')]
for _idx, svc_child in enumerate(host_child[0]):
self.assertTrue(svc_child.get('name') in svcs)
self.assertIn(svc_child.get('name'), svcs)
svc = svcs[svc_child.get('name')]
self.assertEqual(len(svc_child), 1)

4
nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
View File

@ -138,7 +138,7 @@ class CloudpipesXMLSerializerTest(test.NoDBTestCase):
tree = etree.fromstring(text)
self.assertEqual('cloudpipe', tree.tag)
for child in tree:
self.assertTrue(child.tag in exemplar['cloudpipe'])
self.assertIn(child.tag, exemplar['cloudpipe'])
self.assertEqual(child.text, exemplar['cloudpipe'][child.tag])
def test_index_serializer(self):
@ -163,7 +163,7 @@ class CloudpipesXMLSerializerTest(test.NoDBTestCase):
for idx, cl_pipe in enumerate(tree):
kp_data = exemplar['cloudpipes'][idx]
for child in cl_pipe:
self.assertTrue(child.tag in kp_data)
self.assertIn(child.tag, kp_data)
self.assertEqual(child.text, kp_data[child.tag])
def test_deserializer(self):

4
nova/tests/api/openstack/compute/contrib/test_config_drive.py
View File

@ -46,7 +46,7 @@ class ConfigDriveTest(test.TestCase):
response = req.get_response(fakes.wsgi_app(init_only=('servers',)))
self.assertEquals(response.status_int, 200)
res_dict = jsonutils.loads(response.body)
self.assertTrue('config_drive' in res_dict['server'])
self.assertIn('config_drive', res_dict['server'])
def test_detail_servers(self):
self.stubs.Set(db, 'instance_get_all_by_filters',
@ -56,4 +56,4 @@ class ConfigDriveTest(test.TestCase):
server_dicts = jsonutils.loads(res.body)['servers']
self.assertNotEqual(len(server_dicts), 0)
for server_dict in server_dicts:
self.assertTrue('config_drive' in server_dict)
self.assertIn('config_drive', server_dict)

10
nova/tests/api/openstack/compute/contrib/test_coverage_ext.py
View File

@ -106,7 +106,7 @@ class CoverageExtensionTest(test.TestCase):
fake_auth_context=self.admin_context))
self.assertEqual(res.status_int, 200)
resp_dict = jsonutils.loads(res.body)
self.assertTrue('path' in resp_dict)
self.assertIn('path', resp_dict)
def test_report_coverage_action_file(self):
self.stubs.Set(coverage_ext.CoverageController,
@ -125,8 +125,8 @@ class CoverageExtensionTest(test.TestCase):
fake_auth_context=self.admin_context))
self.assertEqual(res.status_int, 200)
resp_dict = jsonutils.loads(res.body)
self.assertTrue('path' in resp_dict)
self.assertTrue('coverage-unit-test.report' in resp_dict['path'])
self.assertIn('path', resp_dict)
self.assertIn('coverage-unit-test.report', resp_dict['path'])
def test_report_coverage_action_xml_file(self):
self.stubs.Set(coverage_ext.CoverageController,
@ -145,8 +145,8 @@ class CoverageExtensionTest(test.TestCase):
fake_auth_context=self.admin_context))
self.assertEqual(res.status_int, 200)
resp_dict = jsonutils.loads(res.body)
self.assertTrue('path' in resp_dict)
self.assertTrue('coverage-xml-unit-test.report' in resp_dict['path'])
self.assertIn('path', resp_dict)
self.assertIn('coverage-xml-unit-test.report', resp_dict['path'])
def test_report_coverage_action_nofile(self):
self.stubs.Set(coverage_ext.CoverageController,

2
nova/tests/api/openstack/compute/contrib/test_disk_config.py
View File

@ -146,7 +146,7 @@ class DiskConfigTestCase(test.TestCase):
nova.tests.image.fake.FakeImageService_reset()
def assertDiskConfig(self, dict_, value):
self.assertTrue(API_DISK_CONFIG in dict_)
self.assertIn(API_DISK_CONFIG, dict_)
self.assertEqual(dict_[API_DISK_CONFIG], value)
def test_show_server(self):

2
nova/tests/api/openstack/compute/contrib/test_floating_ip_pools.py
View File

@ -39,7 +39,7 @@ class FloatingIpPoolTest(test.NoDBTestCase):
def test_translate_floating_ip_pools_view(self):
pools = fake_get_floating_ip_pools(None, self.context)
view = floating_ip_pools._translate_floating_ip_pools_view(pools)
self.assertTrue('floating_ip_pools' in view)
self.assertIn('floating_ip_pools', view)
self.assertEqual(view['floating_ip_pools'][0]['name'],
pools[0]['name'])
self.assertEqual(view['floating_ip_pools'][1]['name'],

4
nova/tests/api/openstack/compute/contrib/test_floating_ips.py
View File

@ -171,7 +171,7 @@ class FloatingIpTest(test.TestCase):
floating_ip = db.floating_ip_get(self.context, floating_ip['id'])
self.controller._normalize_ip(floating_ip)
view = floating_ips._translate_floating_ip_view(floating_ip)
self.assertTrue('floating_ip' in view)
self.assertIn('floating_ip', view)
self.assertTrue(view['floating_ip']['id'])
self.assertEqual(view['floating_ip']['ip'], self.floating_ip)
self.assertEqual(view['floating_ip']['fixed_ip'], None)
@ -182,7 +182,7 @@ class FloatingIpTest(test.TestCase):
'fixed_ip': None}
self.controller._normalize_ip(floating_ip)
view = floating_ips._translate_floating_ip_view(floating_ip)
self.assertTrue('floating_ip' in view)
self.assertIn('floating_ip', view)
def test_floating_ips_list(self):
req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips')

10
nova/tests/api/openstack/compute/contrib/test_fping.py
View File

@ -51,10 +51,10 @@ class FpingTest(test.TestCase):
def test_fping_index(self):
req = fakes.HTTPRequest.blank("/v2/1234/os-fping")
res_dict = self.controller.index(req)
self.assertTrue("servers" in res_dict)
self.assertIn("servers", res_dict)
for srv in res_dict["servers"]:
for key in "project_id", "id", "alive":
self.assertTrue(key in srv)
self.assertIn(key, srv)
def test_fping_index_policy(self):
req = fakes.HTTPRequest.blank("/v2/1234/os-fping?all_tenants=1")
@ -62,7 +62,7 @@ class FpingTest(test.TestCase):
req = fakes.HTTPRequest.blank("/v2/1234/os-fping?all_tenants=1")
req.environ["nova.context"].is_admin = True
res_dict = self.controller.index(req)
self.assertTrue("servers" in res_dict)
self.assertIn("servers", res_dict)
def test_fping_index_include(self):
req = fakes.HTTPRequest.blank("/v2/1234/os-fping")
@ -86,7 +86,7 @@ class FpingTest(test.TestCase):
def test_fping_show(self):
req = fakes.HTTPRequest.blank("/v2/1234/os-fping/%s" % FAKE_UUID)
res_dict = self.controller.show(req, FAKE_UUID)
self.assertTrue("server" in res_dict)
self.assertIn("server", res_dict)
srv = res_dict["server"]
for key in "project_id", "id", "alive":
self.assertTrue(key in srv)
self.assertIn(key, srv)

8
nova/tests/api/openstack/compute/contrib/test_hosts.py
View File

@ -160,13 +160,13 @@ class HostTestCase(test.TestCase):
def test_list_hosts(self):
"""Verify that the compute hosts are returned."""
result = self.controller.index(self.req)
self.assertTrue('hosts' in result)
self.assertIn('hosts', result)
hosts = result['hosts']
self.assertEqual(fake_hosts.HOST_LIST, hosts)
def test_list_hosts_with_zone(self):
result = self.controller.index(FakeRequestWithNovaZone())
self.assertTrue('hosts' in result)
self.assertIn('hosts', result)
hosts = result['hosts']
self.assertEqual(fake_hosts.HOST_LIST_NOVA_ZONE, hosts)
@ -321,7 +321,7 @@ class HostTestCase(test.TestCase):
column = ['host', 'project', 'cpu', 'memory_mb', 'disk_gb']
self.assertEqual(len(result['host']), 3)
for resource in result['host']:
self.assertTrue(resource['resource']['project'] in proj)
self.assertIn(resource['resource']['project'], proj)
self.assertEqual(len(resource['resource']), 5)
self.assertTrue(set(resource['resource'].keys()) == set(column))
db.service_destroy(ctxt, s_ref['id'])
@ -340,7 +340,7 @@ class HostTestCase(test.TestCase):
column = ['host', 'project', 'cpu', 'memory_mb', 'disk_gb']
self.assertEqual(len(result['host']), 5)
for resource in result['host']:
self.assertTrue(resource['resource']['project'] in proj)
self.assertIn(resource['resource']['project'], proj)
self.assertEqual(len(resource['resource']), 5)
self.assertTrue(set(resource['resource'].keys()) == set(column))
db.service_destroy(ctxt, s_ref['id'])

2
nova/tests/api/openstack/compute/contrib/test_hypervisors.py
View File

@ -351,7 +351,7 @@ class HypervisorsSerializersTest(test.NoDBTestCase):
required_children = set([child for child in ('service', 'servers')
if child in exemplar])
for child in hyper:
self.assertTrue(child.tag in required_children)
self.assertIn(child.tag, required_children)
required_children.remove(child.tag)
# Check the node...

14
nova/tests/api/openstack/compute/contrib/test_keypairs.py
View File

@ -332,7 +332,7 @@ class KeypairsTest(test.TestCase):
response = req.get_response(fakes.wsgi_app(init_only=('servers',)))
self.assertEquals(response.status_int, 200)
res_dict = jsonutils.loads(response.body)
self.assertTrue('key_name' in res_dict['server'])
self.assertIn('key_name', res_dict['server'])
self.assertEquals(res_dict['server']['key_name'], '')
def test_detail_servers(self):
@ -344,7 +344,7 @@ class KeypairsTest(test.TestCase):
self.assertEquals(len(server_dicts), 5)
for server_dict in server_dicts:
self.assertTrue('key_name' in server_dict)
self.assertIn('key_name', server_dict)
self.assertEquals(server_dict['key_name'], '')
def test_keypair_create_with_invalid_keypair_body(self):
@ -394,7 +394,7 @@ class KeypairPolicyTest(test.TestCase):
policy.set_rules(rules)
req = fakes.HTTPRequest.blank('/v2/fake/os-keypairs')
res = self.KeyPairController.index(req)
self.assertTrue('keypairs' in res)
self.assertIn('keypairs', res)
def test_keypair_show_fail_policy(self):
rules = policy.Rules({'compute_extension:keypairs:show':
@ -411,7 +411,7 @@ class KeypairPolicyTest(test.TestCase):
policy.set_rules(rules)
req = fakes.HTTPRequest.blank('/v2/fake/os-keypairs/FAKE')
res = self.KeyPairController.show(req, 'FAKE')
self.assertTrue('keypair' in res)
self.assertIn('keypair', res)
def test_keypair_create_fail_policy(self):
rules = policy.Rules({'compute_extension:keypairs:create':
@ -431,7 +431,7 @@ class KeypairPolicyTest(test.TestCase):
req = fakes.HTTPRequest.blank('/v2/fake/os-keypairs')
req.method = 'POST'
res = self.KeyPairController.create(req, body)
self.assertTrue('keypair' in res)
self.assertIn('keypair', res)
def test_keypair_delete_fail_policy(self):
rules = policy.Rules({'compute_extension:keypairs:delete':
@ -472,7 +472,7 @@ class KeypairsXMLSerializerTest(test.TestCase):
self.assertEqual('keypair', tree.tag)
for child in tree:
self.assertTrue(child.tag in exemplar['keypair'])
self.assertIn(child.tag, exemplar['keypair'])
self.assertEqual(child.text, exemplar['keypair'][child.tag])
def test_index_serializer(self):
@ -496,7 +496,7 @@ class KeypairsXMLSerializerTest(test.TestCase):
self.assertEqual('keypair', keypair.tag)
kp_data = exemplar['keypairs'][idx]['keypair']
for child in keypair:
self.assertTrue(child.tag in kp_data)
self.assertIn(child.tag, kp_data)
self.assertEqual(child.text, kp_data[child.tag])
def test_deserializer(self):

2
nova/tests/api/openstack/compute/contrib/test_networks.py
View File

@ -334,7 +334,7 @@ class NetworksTest(test.NoDBTestCase):
def test_network_create(self):
req = fakes.HTTPRequest.blank('/v2/1234/os-networks')
res_dict = self.controller.create(req, NEW_NETWORK)
self.assertTrue('network' in res_dict)
self.assertIn('network', res_dict)
uuid = res_dict['network']['id']
req = fakes.HTTPRequest.blank('/v2/1234/os-networks/%s' % uuid)
res_dict = self.controller.show(req, uuid)

2
nova/tests/api/openstack/compute/contrib/test_quota_classes.py
View File

@ -151,7 +151,7 @@ class QuotaTemplateXMLSerializerTest(test.TestCase):
self.assertEqual('test_class', tree.get('id'))
self.assertEqual(len(exemplar['quota_class_set']) - 1, len(tree))
for child in tree:
self.assertTrue(child.tag in exemplar['quota_class_set'])
self.assertIn(child.tag, exemplar['quota_class_set'])
self.assertEqual(int(child.text),
exemplar['quota_class_set'][child.tag])

2
nova/tests/api/openstack/compute/contrib/test_quotas.py
View File

@ -335,7 +335,7 @@ class QuotaXMLSerializerTest(test.TestCase):
self.assertEqual('project_id', tree.get('id'))
self.assertEqual(len(exemplar['quota_set']) - 1, len(tree))
for child in tree:
self.assertTrue(child.tag in exemplar['quota_set'])
self.assertIn(child.tag, exemplar['quota_set'])
self.assertEqual(int(child.text), exemplar['quota_set'][child.tag])
def test_deserializer(self):

2
nova/tests/api/openstack/compute/contrib/test_security_group_default_rules.py
View File

@ -417,7 +417,7 @@ class TestSecurityGroupDefaultRuleXMLSerializer(test.TestCase):
if child_tag == 'ip_range':
for gr_child in child:
gr_child_tag = self._tag(gr_child)
self.assertTrue(gr_child_tag in raw_rule[child_tag])
self.assertIn(gr_child_tag, raw_rule[child_tag])
seen.add('%s/%s' % (child_tag, gr_child_tag))
self.assertEqual(gr_child.text,
raw_rule[child_tag][gr_child_tag])

4
nova/tests/api/openstack/compute/contrib/test_security_groups.py
View File

@ -1336,12 +1336,12 @@ class TestSecurityGroupXMLSerializer(test.TestCase):
for child in tree:
child_tag = self._tag(child)
self.assertTrue(child_tag in raw_rule)
self.assertIn(child_tag, raw_rule)
seen.add(child_tag)
if child_tag in ('group', 'ip_range'):
for gr_child in child:
gr_child_tag = self._tag(gr_child)
self.assertTrue(gr_child_tag in raw_rule[child_tag])
self.assertIn(gr_child_tag, raw_rule[child_tag])
seen.add('%s/%s' % (child_tag, gr_child_tag))
self.assertEqual(gr_child.text,
raw_rule[child_tag][gr_child_tag])

2
nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py
View File

@ -80,5 +80,5 @@ class TestServerDiagnosticsXMLSerializer(test.NoDBTestCase):
self.assertEqual(len(tree), len(exemplar))
for child in tree:
tag = self._tag(child)
self.assertTrue(tag in exemplar)
self.assertIn(tag, exemplar)
self.assertEqual(child.text, exemplar[tag])

6
nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
View File

@ -198,7 +198,7 @@ class SimpleTenantUsageTest(test.TestCase):
uptime = delta.days * 24 * 3600 + delta.seconds
self.assertEqual(int(servers[j]['uptime']), uptime)
self.assertEqual(int(servers[j]['hours']), HOURS)
self.assertTrue(servers[j]['instance_id'] in uuids)
self.assertIn(servers[j]['instance_id'], uuids)
def test_verify_show_cant_view_other_tenant(self):
req = webob.Request.blank(
@ -248,7 +248,7 @@ class SimpleTenantUsageSerializerTest(test.TestCase):
not_seen = set(raw_usage.keys())
for child in tree:
self.assertTrue(child.tag in not_seen)
self.assertIn(child.tag, not_seen)
not_seen.remove(child.tag)
self.assertEqual(str(raw_usage[child.tag]), child.text)
@ -261,7 +261,7 @@ class SimpleTenantUsageSerializerTest(test.TestCase):
not_seen = set(raw_usage.keys())
for child in tree:
self.assertTrue(child.tag in not_seen)
self.assertIn(child.tag, not_seen)
not_seen.remove(child.tag)
if child.tag == 'server_usages':
for idx, gr_child in enumerate(child):

8
nova/tests/api/openstack/compute/contrib/test_snapshots.py
View File

@ -62,7 +62,7 @@ class SnapshotApiTest(test.NoDBTestCase):
resp = req.get_response(self.app)
self.assertEqual(resp.status_int, 200)
resp_dict = jsonutils.loads(resp.body)
self.assertTrue('snapshot' in resp_dict)
self.assertIn('snapshot', resp_dict)
self.assertEqual(resp_dict['snapshot']['displayName'],
snapshot['display_name'])
self.assertEqual(resp_dict['snapshot']['displayDescription'],
@ -85,7 +85,7 @@ class SnapshotApiTest(test.NoDBTestCase):
self.assertEqual(resp.status_int, 200)
resp_dict = jsonutils.loads(resp.body)
self.assertTrue('snapshot' in resp_dict)
self.assertIn('snapshot', resp_dict)
self.assertEqual(resp_dict['snapshot']['displayName'],
snapshot['display_name'])
self.assertEqual(resp_dict['snapshot']['displayDescription'],
@ -129,7 +129,7 @@ class SnapshotApiTest(test.NoDBTestCase):
self.assertEqual(resp.status_int, 200)
resp_dict = jsonutils.loads(resp.body)
self.assertTrue('snapshot' in resp_dict)
self.assertIn('snapshot', resp_dict)
self.assertEqual(resp_dict['snapshot']['id'], str(snapshot_id))
def test_snapshot_show_invalid_id(self):
@ -146,7 +146,7 @@ class SnapshotApiTest(test.NoDBTestCase):
self.assertEqual(resp.status_int, 200)
resp_dict = jsonutils.loads(resp.body)
self.assertTrue('snapshots' in resp_dict)
self.assertIn('snapshots', resp_dict)
resp_snapshots = resp_dict['snapshots']
self.assertEqual(len(resp_snapshots), 3)

4
nova/tests/api/openstack/compute/contrib/test_used_limits.py
View File

@ -202,7 +202,7 @@ class UsedLimitsTestCase(test.NoDBTestCase):
self.controller.index(fake_req, res)
abs_limits = res.obj['limits']['absolute']
self.assertTrue('totalRAMUsed' in abs_limits)
self.assertIn('totalRAMUsed', abs_limits)
self.assertEqual(abs_limits['totalRAMUsed'], 256)
def test_no_ram_quota(self):
@ -248,4 +248,4 @@ class UsedLimitsTestCase(test.NoDBTestCase):
self.controller.index(fake_req, res)
response = res.serialize(None, 'xml')
self.assertTrue(used_limits.XMLNS in response.body)
self.assertIn(used_limits.XMLNS, response.body)

6
nova/tests/api/openstack/compute/contrib/test_volumes.py
View File

@ -242,7 +242,7 @@ class VolumeApiTest(test.TestCase):
self.assertEqual(resp.status_int, 200)
resp_dict = jsonutils.loads(resp.body)
self.assertTrue('volume' in resp_dict)
self.assertIn('volume', resp_dict)
self.assertEqual(resp_dict['volume']['size'],
vol['size'])
self.assertEqual(resp_dict['volume']['displayName'],
@ -439,7 +439,7 @@ class VolumeSerializerTest(test.TestCase):
self.assertEqual(str(vol[attr]), tree.get(attr))
for child in tree:
self.assertTrue(child.tag in ('attachments', 'metadata'))
self.assertIn(child.tag, ('attachments', 'metadata'))
if child.tag == 'attachments':
self.assertEqual(1, len(child))
self.assertEqual('attachment', child[0].tag)
@ -447,7 +447,7 @@ class VolumeSerializerTest(test.TestCase):
elif child.tag == 'metadata':
not_seen = set(vol['metadata'].keys())
for gr_child in child:
self.assertTrue(gr_child.get("key") in not_seen)
self.assertIn(gr_child.get("key"), not_seen)
self.assertEqual(str(vol['metadata'][gr_child.get("key")]),
gr_child.text)
not_seen.remove(gr_child.get("key"))