openstack
/
keystone
Code Issues Proposed changes

Avoid using dict.get() in assertions 

The method dict.get(key) will return None
in the following two cases:

A. if there is no key in the dictionary.
B. if the real value of the key is just None.

The above two cases will results in passing
the assertion which is not the expected
behaviour of the test.

Change-Id: Ib4a7f2d5beb1e4e9b4d8d9dd90de3f52a5c29e74
This commit is contained in:
Vishakha Agarwal 2018-10-03 09:29:14 +05:30
parent 9c91aa74da
commit 84e1b9ac15
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
keystone/tests/unit/test_backend_sql.py
View File

@ -350,7 +350,7 @@ class SqlIdentity(SqlTests,
project[arbitrary_key] = arbitrary_value
ref = PROVIDERS.resource_api.create_project(project['id'], project)
self.assertEqual(arbitrary_value, ref[arbitrary_key])
self.assertIsNone(ref.get('extra'))
self.assertNotIn('extra', ref)
ref['name'] = uuid.uuid4().hex
ref = PROVIDERS.resource_api.update_project(ref['id'], ref)
@ -374,14 +374,14 @@ class SqlIdentity(SqlTests,
del user["id"]
ref = PROVIDERS.identity_api.create_user(user)
self.assertEqual(arbitrary_value, ref[arbitrary_key])
self.assertIsNone(ref.get('password'))
self.assertIsNone(ref.get('extra'))
self.assertNotIn('password', ref)
self.assertNotIn('extra', ref)
user['name'] = uuid.uuid4().hex
user['password'] = uuid.uuid4().hex
ref = PROVIDERS.identity_api.update_user(ref['id'], user)
self.assertIsNone(ref.get('password'))
self.assertIsNone(ref['extra'].get('password'))
self.assertNotIn('password', ref)
self.assertNotIn('password', ref['extra'])
self.assertEqual(arbitrary_value, ref[arbitrary_key])
self.assertEqual(arbitrary_value, ref['extra'][arbitrary_key])

6
keystone/tests/unit/test_v3.py
View File

@ -932,7 +932,7 @@ class RestfulTestCase(unit.SQLDriverOverrides, rest.RestfulTestCase,
def assertValidUser(self, entity, ref=None):
self.assertIsNotNone(entity.get('domain_id'))
self.assertIsNotNone(entity.get('email'))
self.assertIsNone(entity.get('password'))
self.assertNotIn('password', entity)
self.assertNotIn('tenantId', entity)
self.assertIn('password_expires_at', entity)
if ref:
@ -1070,7 +1070,7 @@ class RestfulTestCase(unit.SQLDriverOverrides, rest.RestfulTestCase,
# Only one of user or group should be present
if entity.get('user'):
self.assertIsNone(entity.get('group'))
self.assertNotIn('group', entity)
self.assertIsNotNone(entity['user'].get('id'))
else:
self.assertIsNotNone(entity.get('group'))
@ -1080,7 +1080,7 @@ class RestfulTestCase(unit.SQLDriverOverrides, rest.RestfulTestCase,
self.assertIsNotNone(entity.get('scope'))
if entity['scope'].get('project'):
self.assertIsNone(entity['scope'].get('domain'))
self.assertNotIn('domain', entity['scope'])
self.assertIsNotNone(entity['scope']['project'].get('id'))
elif entity['scope'].get('domain'):
self.assertIsNotNone(entity['scope'].get('domain'))

4
keystone/tests/unit/test_v3_filters.py
View File

@ -834,7 +834,7 @@ class IdentityTestListLimitCase(IdentityTestFilteredCase):
self._set_policy({"identity:list_services": []})
r = self.get('/services', auth=self.auth)
self.assertEqual(10, len(r.result.get('services')))
self.assertIsNone(r.result.get('truncated'))
self.assertNotIn('truncated', r.result)
def test_at_limit(self):
"""Check truncated attribute not set when list at max size."""
@ -846,4 +846,4 @@ class IdentityTestListLimitCase(IdentityTestFilteredCase):
self.config_fixture.config(group='catalog', list_limit=10)
r = self.get('/services', auth=self.auth)
self.assertEqual(10, len(r.result.get('services')))
self.assertIsNone(r.result.get('truncated'))
self.assertNotIn('truncated', r.result)

6
keystone/tests/unit/test_v3_resource.py
View File

@ -1126,9 +1126,9 @@ class ResourceTestCase(test_v3.RestfulTestCase,
r = self.get('/projects/%(project_id)s?include_limits' %
{'project_id': subproject['project']['id']})
self.assertIsNone(r.result['project'].get('parents'))
self.assertIsNone(r.result['project'].get('subtree'))
self.assertIsNone(r.result['project'].get('limits'))
self.assertNotIn('parents', r.result['project'])
self.assertNotIn('subtree', r.result['project'])
self.assertNotIn('limits', r.result['project'])
# using "include_limits" with "parents_as_list"
r = self.get('/projects/%(project_id)s?include_limits&parents_as_list'