openstack
/
keystone
Code Issues Proposed changes

Fix assertEqual arguments order(_ldap_tls_livetest, backend_kvs, etc) 

assertEqual method's arguments should be in
('expected', 'actual') order.

Partial-Bug: #1277104

Change-Id: I48d2220ebd39d72de071a4644b75182941bb5f4f
This commit is contained in:
Haiwei Xu 2014-02-20 23:37:41 +09:00
parent ec995b3376
commit 593f7c7387
3 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/tests/_ldap_tls_livetest.py
View File

@ -54,7 +54,7 @@ class LiveTLSLDAPIdentity(_ldap_livetest.LiveLDAPIdentity):
'tenants': ['bar']}
self.identity_api.create_user('fake1', user)
user_ref = self.identity_api.get_user('fake1')
self.assertEqual(user_ref['id'], 'fake1')
self.assertEqual('fake1', user_ref['id'])
user['password'] = 'fakepass2'
self.identity_api.update_user('fake1', user)
@ -76,7 +76,7 @@ class LiveTLSLDAPIdentity(_ldap_livetest.LiveLDAPIdentity):
'tenants': ['bar']}
self.identity_api.create_user('fake1', user)
user_ref = self.identity_api.get_user('fake1')
self.assertEqual(user_ref['id'], 'fake1')
self.assertEqual('fake1', user_ref['id'])
user['password'] = 'fakepass2'
self.identity_api.update_user('fake1', user)

6
keystone/tests/test_backend_kvs.py
View File

@ -108,7 +108,7 @@ class KvsToken(tests.TestCase, test_backend.TokenTests):
subsecond=True)),
(expired_token_id, timeutils.isotime(expired_token_ref['expires'],
subsecond=True))]
self.assertEqual(user_token_list, expected_user_token_list)
self.assertEqual(expected_user_token_list, user_token_list)
new_expired_data = (expired_token_id,
timeutils.isotime(
(timeutils.utcnow() - expire_delta),
@ -124,7 +124,7 @@ class KvsToken(tests.TestCase, test_backend.TokenTests):
(valid_token_id_2, timeutils.isotime(valid_token_ref_2['expires'],
subsecond=True))]
user_token_list = self.token_api.driver._store.get(user_key)
self.assertEqual(user_token_list, expected_user_token_list)
self.assertEqual(expected_user_token_list, user_token_list)
# Test that revoked tokens are removed from the list on create.
self.token_api.delete_token(valid_token_id_2)
@ -136,7 +136,7 @@ class KvsToken(tests.TestCase, test_backend.TokenTests):
(new_token_id, timeutils.isotime(new_token_ref['expires'],
subsecond=True))]
user_token_list = self.token_api.driver._store.get(user_key)
self.assertEqual(user_token_list, expected_user_token_list)
self.assertEqual(expected_user_token_list, user_token_list)
class KvsTrust(tests.TestCase, test_backend.TrustTests):

55
keystone/tests/test_content_types.py
View File

@ -452,7 +452,7 @@ class CoreApiTests(object):
},
token=token,
expected_status=200)
self.assertEqual(self._get_role_name(r.result), CONF.member_role_name)
self.assertEqual(CONF.member_role_name, self._get_role_name(r.result))
# Create a new tenant
r = self.admin_request(
@ -492,7 +492,7 @@ class CoreApiTests(object):
},
token=token,
expected_status=200)
self.assertEqual(self._get_role_name(r.result), '_member_')
self.assertEqual('_member_', self._get_role_name(r.result))
# 'member_role' should not be in tenant_bar any more
r = self.admin_request(
@ -597,7 +597,7 @@ class CoreApiTests(object):
},
token=token,
expected_status=200)
self.assertEqual(self._get_role_name(r.result), CONF.member_role_name)
self.assertEqual(CONF.member_role_name, self._get_role_name(r.result))
# Update user's tenant with old tenant id
r = self.admin_request(
@ -621,7 +621,7 @@ class CoreApiTests(object):
},
token=token,
expected_status=200)
self.assertEqual(self._get_role_name(r.result), '_member_')
self.assertEqual('_member_', self._get_role_name(r.result))
def test_authenticating_a_user_with_no_password(self):
token = self.get_scoped_token()
@ -659,9 +659,8 @@ class CoreApiTests(object):
r = self.public_request(
path='/v2.0/tenants',
expected_status=401)
self.assertEqual(r.headers.get('WWW-Authenticate'),
'Keystone uri="%s"' % (
CONF.public_endpoint % CONF))
self.assertEqual('Keystone uri="%s"' % (CONF.public_endpoint % CONF),
r.headers.get('WWW-Authenticate'))
class LegacyV2UsernameTests(object):
@ -704,7 +703,7 @@ class LegacyV2UsernameTests(object):
self.assertValidUserResponse(r)
user = self.get_user_from_response(r)
self.assertEqual(user.get('username'), fake_username)
self.assertEqual(fake_username, user.get('username'))
def test_get_returns_username_from_extra(self):
"""The response for getting a user will contain the extra fields."""
@ -719,7 +718,7 @@ class LegacyV2UsernameTests(object):
self.assertValidUserResponse(r)
user = self.get_user_from_response(r)
self.assertEqual(user.get('username'), fake_username)
self.assertEqual(fake_username, user.get('username'))
def test_update_returns_new_username_when_adding_username(self):
"""The response for updating a user will contain the extra fields.
@ -750,7 +749,7 @@ class LegacyV2UsernameTests(object):
self.assertValidUserResponse(r)
user = self.get_user_from_response(r)
self.assertEqual(user.get('username'), 'new_username')
self.assertEqual('new_username', user.get('username'))
def test_update_returns_new_username_when_updating_username(self):
"""The response for updating a user will contain the extra fields.
@ -780,7 +779,7 @@ class LegacyV2UsernameTests(object):
self.assertValidUserResponse(r)
user = self.get_user_from_response(r)
self.assertEqual(user.get('username'), 'new_username')
self.assertEqual('new_username', user.get('username'))
def test_username_is_always_returned_create(self):
"""Username is set as the value of name if no username is provided.
@ -934,7 +933,7 @@ class LegacyV2UsernameTests(object):
self.assertValidUserResponse(r)
user = self.get_user_from_response(r)
self.assertEqual(user.get('name'), new_username)
self.assertEqual(new_username, user.get('name'))
self.assertEqual(user.get('name'), user.get('username'))
@ -971,7 +970,7 @@ class JsonTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
return r.result['access']['token']['id']
def assertNoRoles(self, r):
self.assertEqual(r['roles'], [])
self.assertEqual([], r['roles'])
def assertValidErrorResponse(self, r):
self.assertIsNotNone(r.result.get('error'))
@ -1307,7 +1306,7 @@ class XmlTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
return r.get('id')
def assertNoRoles(self, r):
self.assertEqual(len(r), 0)
self.assertEqual(0, len(r))
def _get_token_id(self, r):
return r.result.find(self._tag('token')).get('id')
@ -1318,10 +1317,10 @@ class XmlTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
def assertValidErrorResponse(self, r):
xml = r.result
self.assertEqual(xml.tag, self._tag('error'))
self.assertEqual(self._tag('error'), xml.tag)
self.assertValidError(xml)
self.assertEqual(xml.get('code'), str(r.status_code))
self.assertEqual(str(r.status_code), xml.get('code'))
def assertValidExtension(self, extension, expected):
super(XmlTestCase, self).assertValidExtension(extension)
@ -1338,14 +1337,14 @@ class XmlTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
def assertValidExtensionListResponse(self, r, expected):
xml = r.result
self.assertEqual(xml.tag, self._tag('extensions'))
self.assertEqual(self._tag('extensions'), xml.tag)
self.assertNotEmpty(xml.findall(self._tag('extension')))
for ext in xml.findall(self._tag('extension')):
self.assertValidExtension(ext, expected)
def assertValidExtensionResponse(self, r, expected):
xml = r.result
self.assertEqual(xml.tag, self._tag('extension'))
self.assertEqual(self._tag('extension'), xml.tag)
self.assertValidExtension(xml, expected)
@ -1368,7 +1367,7 @@ class XmlTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
def assertValidMultipleChoiceResponse(self, r):
xml = r.result
self.assertEqual(xml.tag, self._tag('versions'))
self.assertEqual(self._tag('versions'), xml.tag)
self.assertNotEmpty(xml.findall(self._tag('version')))
for version in xml.findall(self._tag('version')):
@ -1376,13 +1375,13 @@ class XmlTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
def assertValidVersionResponse(self, r):
xml = r.result
self.assertEqual(xml.tag, self._tag('version'))
self.assertEqual(self._tag('version'), xml.tag)
self.assertValidVersion(xml)
def assertValidEndpointListResponse(self, r):
xml = r.result
self.assertEqual(xml.tag, self._tag('endpoints'))
self.assertEqual(self._tag('endpoints'), xml.tag)
self.assertNotEmpty(xml.findall(self._tag('endpoint')))
for endpoint in xml.findall(self._tag('endpoint')):
@ -1395,19 +1394,19 @@ class XmlTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
def assertValidTenantResponse(self, r):
xml = r.result
self.assertEqual(xml.tag, self._tag('tenant'))
self.assertEqual(self._tag('tenant'), xml.tag)
self.assertValidTenant(xml)
def assertValidUserResponse(self, r):
xml = r.result
self.assertEqual(xml.tag, self._tag('user'))
self.assertEqual(self._tag('user'), xml.tag)
self.assertValidUser(xml)
def assertValidRoleListResponse(self, r):
xml = r.result
self.assertEqual(xml.tag, self._tag('roles'))
self.assertEqual(self._tag('roles'), xml.tag)
self.assertNotEmpty(r.result.findall(self._tag('role')))
for role in r.result.findall(self._tag('role')):
@ -1416,7 +1415,7 @@ class XmlTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
def assertValidAuthenticationResponse(self, r,
require_service_catalog=False):
xml = r.result
self.assertEqual(xml.tag, self._tag('access'))
self.assertEqual(self._tag('access'), xml.tag)
# validate token
token = xml.find(self._tag('token'))
@ -1463,7 +1462,7 @@ class XmlTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
def assertValidTenantListResponse(self, r):
xml = r.result
self.assertEqual(xml.tag, self._tag('tenants'))
self.assertEqual(self._tag('tenants'), xml.tag)
self.assertNotEmpty(r.result)
for tenant in r.result.findall(self._tag('tenant')):
@ -1515,7 +1514,7 @@ class XmlTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
self._from_content_type(r, 'json')
self.assertIsNotNone(r.result.get('tenant'))
self.assertValidTenant(r.result['tenant'])
self.assertEqual(r.result['tenant'].get('description'), "")
self.assertEqual("", r.result['tenant'].get('description'))
def test_add_tenant_json(self):
"""Create a tenant without providing description field."""
@ -1538,7 +1537,7 @@ class XmlTestCase(RestfulTestCase, CoreApiTests, LegacyV2UsernameTests):
self._from_content_type(r, 'json')
self.assertIsNotNone(r.result.get('tenant'))
self.assertValidTenant(r.result['tenant'])
self.assertEqual(r.result['tenant'].get('description'), "")
self.assertEqual("", r.result['tenant'].get('description'))
def test_create_project_invalid_enabled_type_string(self):
# Forbidden usage of string for 'enabled' field in JSON and XML