openstack/deb-python-keystoneclient
Code Issues Proposed changes

Merge "Replace assertTrue with explicit assertIsInstance"

Browse Source
This commit is contained in:
Jenkins
2014-01-23 01:43:06 +00:00
committed by Gerrit Code Review
parent 19d0396224 e0ce9bd8c8
commit 290a3be313
11 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/tests/apiclient/test_exceptions.py
View File

@@ -39,7 +39,7 @@ class ExceptionsArgsTest(utils.TestCase):
json_data=json_data),
method,
url)
self.assertTrue(isinstance(ex, ex_cls))
self.assertIsInstance(ex, ex_cls)
self.assertEqual(ex.message, json_data["error"]["message"])
self.assertEqual(ex.details, json_data["error"]["details"])
self.assertEqual(ex.method, method)

4
keystoneclient/tests/v2_0/test_ec2.py
View File

@@ -40,7 +40,7 @@ class EC2Tests(utils.TestCase):
'OS-EC2'], json=resp_body)
cred = self.client.ec2.create(user_id, tenant_id)
self.assertTrue(isinstance(cred, ec2.EC2))
self.assertIsInstance(cred, ec2.EC2)
self.assertEqual(cred.tenant_id, tenant_id)
self.assertEqual(cred.enabled, True)
self.assertEqual(cred.access, 'access')
@@ -64,7 +64,7 @@ class EC2Tests(utils.TestCase):
'OS-EC2', 'access'], json=resp_body)
cred = self.client.ec2.get(user_id, 'access')
self.assertTrue(isinstance(cred, ec2.EC2))
self.assertIsInstance(cred, ec2.EC2)
self.assertEqual(cred.tenant_id, tenant_id)
self.assertEqual(cred.enabled, True)
self.assertEqual(cred.access, 'access')

4
keystoneclient/tests/v2_0/test_endpoints.py
View File

@@ -71,7 +71,7 @@ class EndpointTests(utils.TestCase):
internalurl=req_body['endpoint']['internalurl'],
service_id=req_body['endpoint']['service_id']
)
self.assertTrue(isinstance(endpoint, endpoints.Endpoint))
self.assertIsInstance(endpoint, endpoints.Endpoint)
self.assertRequestBodyIs(json=req_body)
@httpretty.activate
@@ -84,5 +84,5 @@ class EndpointTests(utils.TestCase):
self.stub_url(httpretty.GET, ['endpoints'], json=self.TEST_ENDPOINTS)
endpoint_list = self.client.endpoints.list()
[self.assertTrue(isinstance(r, endpoints.Endpoint))
[self.assertIsInstance(r, endpoints.Endpoint)
for r in endpoint_list]

10
keystoneclient/tests/v2_0/test_roles.py
View File

@@ -53,7 +53,7 @@ class RoleTests(utils.TestCase):
role = self.client.roles.create(req_body['role']['name'])
self.assertRequestBodyIs(json=req_body)
self.assertTrue(isinstance(role, roles.Role))
self.assertIsInstance(role, roles.Role)
self.assertEqual(role.id, 3)
self.assertEqual(role.name, req_body['role']['name'])
@@ -68,7 +68,7 @@ class RoleTests(utils.TestCase):
json={'role': self.TEST_ROLES['roles']['values'][0]})
role = self.client.roles.get(1)
self.assertTrue(isinstance(role, roles.Role))
self.assertIsInstance(role, roles.Role)
self.assertEqual(role.id, 1)
self.assertEqual(role.name, 'admin')
@@ -78,7 +78,7 @@ class RoleTests(utils.TestCase):
json=self.TEST_ROLES)
role_list = self.client.roles.list()
[self.assertTrue(isinstance(r, roles.Role)) for r in role_list]
[self.assertIsInstance(r, roles.Role) for r in role_list]
@httpretty.activate
def test_roles_for_user(self):
@@ -86,7 +86,7 @@ class RoleTests(utils.TestCase):
json=self.TEST_ROLES)
role_list = self.client.roles.roles_for_user('foo')
[self.assertTrue(isinstance(r, roles.Role)) for r in role_list]
[self.assertIsInstance(r, roles.Role) for r in role_list]
@httpretty.activate
def test_roles_for_user_tenant(self):
@@ -94,7 +94,7 @@ class RoleTests(utils.TestCase):
'roles'], json=self.TEST_ROLES)
role_list = self.client.roles.roles_for_user('foo', 'barrr')
[self.assertTrue(isinstance(r, roles.Role)) for r in role_list]
[self.assertIsInstance(r, roles.Role) for r in role_list]
@httpretty.activate
def test_add_user_role(self):

6
keystoneclient/tests/v2_0/test_services.py
View File

@@ -63,7 +63,7 @@ class ServiceTests(utils.TestCase):
req_body['OS-KSADM:service']['name'],
req_body['OS-KSADM:service']['type'],
req_body['OS-KSADM:service']['description'])
self.assertTrue(isinstance(service, services.Service))
self.assertIsInstance(service, services.Service)
self.assertEqual(service.id, 3)
self.assertEqual(service.name, req_body['OS-KSADM:service']['name'])
self.assertRequestBodyIs(json=req_body)
@@ -83,7 +83,7 @@ class ServiceTests(utils.TestCase):
json={'OS-KSADM:service': test_services})
service = self.client.services.get(1)
self.assertTrue(isinstance(service, services.Service))
self.assertIsInstance(service, services.Service)
self.assertEqual(service.id, 1)
self.assertEqual(service.name, 'nova')
self.assertEqual(service.type, 'compute')
@@ -94,5 +94,5 @@ class ServiceTests(utils.TestCase):
json=self.TEST_SERVICES)
service_list = self.client.services.list()
[self.assertTrue(isinstance(r, services.Service))
[self.assertIsInstance(r, services.Service)
for r in service_list]

20
keystoneclient/tests/v2_0/test_tenants.py
View File

@@ -82,7 +82,7 @@ class TenantTests(utils.TestCase):
req_body['tenant']['enabled'],
extravalue01=req_body['tenant']['extravalue01'],
name="dont overwrite priors")
self.assertTrue(isinstance(tenant, tenants.Tenant))
self.assertIsInstance(tenant, tenants.Tenant)
self.assertEqual(tenant.id, 4)
self.assertEqual(tenant.name, "tenantX")
self.assertEqual(tenant.description, "Like tenant 9, but better.")
@@ -125,7 +125,7 @@ class TenantTests(utils.TestCase):
self.stub_url(httpretty.GET, ['tenants', '1'], json=resp)
t = self.client.tenants.get(1)
self.assertTrue(isinstance(t, tenants.Tenant))
self.assertIsInstance(t, tenants.Tenant)
self.assertEqual(t.id, 1)
self.assertEqual(t.name, 'admin')
@@ -134,7 +134,7 @@ class TenantTests(utils.TestCase):
self.stub_url(httpretty.GET, ['tenants'], json=self.TEST_TENANTS)
tenant_list = self.client.tenants.list()
[self.assertTrue(isinstance(t, tenants.Tenant)) for t in tenant_list]
[self.assertIsInstance(t, tenants.Tenant) for t in tenant_list]
@httpretty.activate
def test_list_limit(self):
@@ -142,7 +142,7 @@ class TenantTests(utils.TestCase):
tenant_list = self.client.tenants.list(limit=1)
self.assertQueryStringIs('limit=1')
[self.assertTrue(isinstance(t, tenants.Tenant)) for t in tenant_list]
[self.assertIsInstance(t, tenants.Tenant) for t in tenant_list]
@httpretty.activate
def test_list_marker(self):
@@ -150,7 +150,7 @@ class TenantTests(utils.TestCase):
tenant_list = self.client.tenants.list(marker=1)
self.assertQueryStringIs('marker=1')
[self.assertTrue(isinstance(t, tenants.Tenant)) for t in tenant_list]
[self.assertIsInstance(t, tenants.Tenant) for t in tenant_list]
@httpretty.activate
def test_list_limit_marker(self):
@@ -158,7 +158,7 @@ class TenantTests(utils.TestCase):
tenant_list = self.client.tenants.list(limit=1, marker=1)
self.assertQueryStringIs('marker=1&limit=1')
[self.assertTrue(isinstance(t, tenants.Tenant)) for t in tenant_list]
[self.assertIsInstance(t, tenants.Tenant) for t in tenant_list]
@httpretty.activate
def test_update(self):
@@ -191,7 +191,7 @@ class TenantTests(utils.TestCase):
req_body['tenant']['enabled'],
extravalue01=req_body['tenant']['extravalue01'],
name="dont overwrite priors")
self.assertTrue(isinstance(tenant, tenants.Tenant))
self.assertIsInstance(tenant, tenants.Tenant)
self.assertRequestBodyIs(json=req_body)
self.assertEqual(tenant.id, 4)
self.assertEqual(tenant.name, "tenantX")
@@ -223,7 +223,7 @@ class TenantTests(utils.TestCase):
req_body['tenant']['name'],
req_body['tenant']['description'],
req_body['tenant']['enabled'])
self.assertTrue(isinstance(tenant, tenants.Tenant))
self.assertIsInstance(tenant, tenants.Tenant)
self.assertRequestBodyIs(json=req_body)
self.assertEqual(tenant.id, 4)
self.assertEqual(tenant.name, "tenantX")
@@ -263,7 +263,7 @@ class TenantTests(utils.TestCase):
tenant = self.client.tenants.resource_class(self.client.tenants,
req_body['tenant'])
tenant.add_user('foo', 'barrr')
self.assertTrue(isinstance(tenant, tenants.Tenant))
self.assertIsInstance(tenant, tenants.Tenant)
@httpretty.activate
def test_tenant_remove_user(self):
@@ -284,4 +284,4 @@ class TenantTests(utils.TestCase):
tenant = self.client.tenants.resource_class(self.client.tenants,
req_body['tenant'])
tenant.remove_user('foo', 'barrr')
self.assertTrue(isinstance(tenant, tenants.Tenant))
self.assertIsInstance(tenant, tenants.Tenant)

14
keystoneclient/tests/v2_0/test_users.py
View File

@@ -70,7 +70,7 @@ class UserTests(utils.TestCase):
req_body['user']['email'],
tenant_id=req_body['user']['tenantId'],
enabled=req_body['user']['enabled'])
self.assertTrue(isinstance(user, users.User))
self.assertIsInstance(user, users.User)
self.assertEqual(user.id, 3)
self.assertEqual(user.name, "gabriel")
self.assertEqual(user.email, "test@example.com")
@@ -105,7 +105,7 @@ class UserTests(utils.TestCase):
req_body['user']['password'],
tenant_id=req_body['user']['tenantId'],
enabled=req_body['user']['enabled'])
self.assertTrue(isinstance(user, users.User))
self.assertIsInstance(user, users.User)
self.assertEqual(user.id, 3)
self.assertEqual(user.name, "gabriel")
self.assertRequestBodyIs(json=req_body)
@@ -121,7 +121,7 @@ class UserTests(utils.TestCase):
json={'user': self.TEST_USERS['users']['values'][0]})
u = self.client.users.get(1)
self.assertTrue(isinstance(u, users.User))
self.assertIsInstance(u, users.User)
self.assertEqual(u.id, 1)
self.assertEqual(u.name, 'admin')
@@ -130,7 +130,7 @@ class UserTests(utils.TestCase):
self.stub_url(httpretty.GET, ['users'], json=self.TEST_USERS)
user_list = self.client.users.list()
[self.assertTrue(isinstance(u, users.User)) for u in user_list]
[self.assertIsInstance(u, users.User) for u in user_list]
@httpretty.activate
def test_list_limit(self):
@@ -139,7 +139,7 @@ class UserTests(utils.TestCase):
user_list = self.client.users.list(limit=1)
self.assertEqual(httpretty.last_request().querystring,
{'limit': ['1']})
[self.assertTrue(isinstance(u, users.User)) for u in user_list]
[self.assertIsInstance(u, users.User) for u in user_list]
@httpretty.activate
def test_list_marker(self):
@@ -148,7 +148,7 @@ class UserTests(utils.TestCase):
user_list = self.client.users.list(marker='foo')
self.assertDictEqual(httpretty.last_request().querystring,
{'marker': ['foo']})
[self.assertTrue(isinstance(u, users.User)) for u in user_list]
[self.assertIsInstance(u, users.User) for u in user_list]
@httpretty.activate
def test_list_limit_marker(self):
@@ -158,7 +158,7 @@ class UserTests(utils.TestCase):
self.assertDictEqual(httpretty.last_request().querystring,
{'marker': ['foo'], 'limit': ['1']})
[self.assertTrue(isinstance(u, users.User)) for u in user_list]
[self.assertIsInstance(u, users.User) for u in user_list]
@httpretty.activate
def test_update(self):

4
keystoneclient/tests/v3/test_groups.py
View File

@@ -46,7 +46,7 @@ class GroupTests(utils.TestCase, utils.CrudTests):
returned_list = self.manager.list(user=user_id)
self.assertEqual(len(ref_list), len(returned_list))
[self.assertTrue(isinstance(r, self.model)) for r in returned_list]
[self.assertIsInstance(r, self.model) for r in returned_list]
@httpretty.activate
def test_list_groups_for_domain(self):
@@ -59,7 +59,7 @@ class GroupTests(utils.TestCase, utils.CrudTests):
returned_list = self.manager.list(domain=domain_id)
self.assertTrue(len(ref_list), len(returned_list))
[self.assertTrue(isinstance(r, self.model)) for r in returned_list]
[self.assertIsInstance(r, self.model) for r in returned_list]
self.assertEqual(httpretty.last_request().querystring,
{'domain_id': [domain_id]})

4
keystoneclient/tests/v3/test_projects.py
View File

@@ -46,7 +46,7 @@ class ProjectTests(utils.TestCase, utils.CrudTests):
returned_list = self.manager.list(user=user_id)
self.assertEqual(len(ref_list), len(returned_list))
[self.assertTrue(isinstance(r, self.model)) for r in returned_list]
[self.assertIsInstance(r, self.model) for r in returned_list]
@httpretty.activate
def test_list_projects_for_domain(self):
@@ -58,7 +58,7 @@ class ProjectTests(utils.TestCase, utils.CrudTests):
returned_list = self.manager.list(domain=domain_id)
self.assertEqual(len(ref_list), len(returned_list))
[self.assertTrue(isinstance(r, self.model)) for r in returned_list]
[self.assertIsInstance(r, self.model) for r in returned_list]
self.assertEqual(httpretty.last_request().querystring,
{'domain_id': [domain_id]})

10
keystoneclient/tests/v3/test_users.py
View File

@@ -65,7 +65,7 @@ class UserTests(utils.TestCase, utils.CrudTests):
returned_list = self.manager.list(group=group_id)
self.assertEqual(len(ref_list), len(returned_list))
[self.assertTrue(isinstance(r, self.model)) for r in returned_list]
[self.assertIsInstance(r, self.model) for r in returned_list]
@httpretty.activate
def test_check_user_in_group(self):
@@ -115,7 +115,7 @@ class UserTests(utils.TestCase, utils.CrudTests):
params = utils.parameterize(param_ref)
returned = self.manager.create(**params)
self.assertTrue(isinstance(returned, self.model))
self.assertIsInstance(returned, self.model)
for attr in ref:
self.assertEqual(
getattr(returned, attr),
@@ -142,7 +142,7 @@ class UserTests(utils.TestCase, utils.CrudTests):
params = utils.parameterize(param_ref)
returned = self.manager.create(**params)
self.assertTrue(isinstance(returned, self.model))
self.assertIsInstance(returned, self.model)
for attr in ref:
self.assertEqual(
getattr(returned, attr),
@@ -168,7 +168,7 @@ class UserTests(utils.TestCase, utils.CrudTests):
params = utils.parameterize(param_ref)
returned = self.manager.update(ref['id'], **params)
self.assertTrue(isinstance(returned, self.model))
self.assertIsInstance(returned, self.model)
for attr in ref:
self.assertEqual(
getattr(returned, attr),
@@ -192,7 +192,7 @@ class UserTests(utils.TestCase, utils.CrudTests):
params = utils.parameterize(param_ref)
returned = self.manager.update(ref['id'], **params)
self.assertTrue(isinstance(returned, self.model))
self.assertIsInstance(returned, self.model)
for attr in ref:
self.assertEqual(
getattr(returned, attr),

10
keystoneclient/tests/v3/utils.py
View File

@@ -201,7 +201,7 @@ class CrudTests(object):
self.stub_entity(httpretty.POST, entity=req_ref, status=201)
returned = self.manager.create(**parameterize(manager_ref))
self.assertTrue(isinstance(returned, self.model))
self.assertIsInstance(returned, self.model)
for attr in req_ref:
self.assertEqual(
getattr(returned, attr),
@@ -216,7 +216,7 @@ class CrudTests(object):
self.stub_entity(httpretty.GET, id=ref['id'], entity=ref)
returned = self.manager.get(ref['id'])
self.assertTrue(isinstance(returned, self.model))
self.assertIsInstance(returned, self.model)
for attr in ref:
self.assertEqual(
getattr(returned, attr),
@@ -240,7 +240,7 @@ class CrudTests(object):
returned_list = self.manager.list(**filter_kwargs)
self.assertEqual(len(ref_list), len(returned_list))
[self.assertTrue(isinstance(r, self.model)) for r in returned_list]
[self.assertIsInstance(r, self.model) for r in returned_list]
@httpretty.activate
def test_find(self, ref=None):
@@ -250,7 +250,7 @@ class CrudTests(object):
self.stub_entity(httpretty.GET, entity=ref_list)
returned = self.manager.find(name=getattr(ref, 'name', None))
self.assertTrue(isinstance(returned, self.model))
self.assertIsInstance(returned, self.model)
for attr in ref:
self.assertEqual(
getattr(returned, attr),
@@ -276,7 +276,7 @@ class CrudTests(object):
req_ref.pop('id')
returned = self.manager.update(ref['id'], **parameterize(req_ref))
self.assertTrue(isinstance(returned, self.model))
self.assertIsInstance(returned, self.model)
for attr in ref:
self.assertEqual(
getattr(returned, attr),