openstack
/
keystone
Code Issues Proposed changes

Fixes the order of assertEqual arguments 

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

Change-Id: I524113ccc4a00e8363b2f9c418a3754f482b44d0
Partial-Bug: #1277104
This commit is contained in:
Haiwei Xu 2014-03-04 01:24:38 +09:00 committed by David Stanek
parent f82b887953
commit 9d12ec57a2
6 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
keystone/tests/test_pemutils.py
View File

@ -97,9 +97,9 @@ class TestPEMParse(tests.TestCase):
text += 'burfl blatz bingo\n'
parse_results = pemutils.parse_pem(text)
self.assertEqual(len(parse_results), 0)
self.assertEqual(0, len(parse_results))
self.assertEqual(pemutils.is_pem(text), False)
self.assertEqual(False, pemutils.is_pem(text))
def test_parse_invalid(self):
p = PEM(pem_type='xxx',
@ -125,7 +125,7 @@ class TestPEMParse(tests.TestCase):
text = p.pem_text
parse_results = pemutils.parse_pem(text)
self.assertEqual(len(parse_results), 1)
self.assertEqual(1, len(parse_results))
r = parse_results[0]
self.assertEqual(p.pem_type, r.pem_type)
@ -145,7 +145,7 @@ class TestPEMParse(tests.TestCase):
text += 'burfl blatz bingo\n'
parse_results = pemutils.parse_pem(text)
self.assertEqual(len(parse_results), 1)
self.assertEqual(1, len(parse_results))
r = parse_results[0]
self.assertEqual(p.pem_type, r.pem_type)
@ -172,7 +172,7 @@ class TestPEMParse(tests.TestCase):
text += pems[i].pem_text
parse_results = pemutils.parse_pem(text)
self.assertEqual(len(parse_results), count)
self.assertEqual(count, len(parse_results))
for i in moves.range(count):
r = parse_results[i]
@ -203,7 +203,7 @@ class TestPEMParse(tests.TestCase):
for i in moves.range(count):
parse_results = pemutils.parse_pem(text, pem_type=headers[i][0])
self.assertEqual(len(parse_results), 1)
self.assertEqual(1, len(parse_results))
r = parse_results[0]
p = pems[i]
@ -235,7 +235,7 @@ class TestPEMParse(tests.TestCase):
text += 'burfl blatz bingo\n'
parse_results = pemutils.parse_pem(text)
self.assertEqual(len(parse_results), count)
self.assertEqual(count, len(parse_results))
for i in moves.range(count):
r = parse_results[i]

40
keystone/tests/test_sql_upgrade.py
View File

@ -500,7 +500,7 @@ class SqlUpgradeTests(SqlMigrateBase):
base_data['project']['id']))
r = session.execute(s)
data = json.loads(r.fetchone()['data'])
self.assertEqual(len(data['roles']), 1)
self.assertEqual(1, len(data['roles']))
self.assertIn({'id': base_data['roles'][0]['id']}, data['roles'])
s = sqlalchemy.select([user_project_table.c.data]).where(
@ -509,7 +509,7 @@ class SqlUpgradeTests(SqlMigrateBase):
base_data['project2']['id']))
r = session.execute(s)
data = json.loads(r.fetchone()['data'])
self.assertEqual(len(data['roles']), 2)
self.assertEqual(2, len(data['roles']))
self.assertIn({'id': base_data['roles'][1]['id']}, data['roles'])
self.assertIn({'id': base_data['roles'][2]['id']}, data['roles'])
@ -519,7 +519,7 @@ class SqlUpgradeTests(SqlMigrateBase):
base_data['project']['id']))
r = session.execute(s)
data = json.loads(r.fetchone()['data'])
self.assertEqual(len(data['roles']), 1)
self.assertEqual(1, len(data['roles']))
self.assertIn({'id': base_data['roles'][3]['id']}, data['roles'])
s = sqlalchemy.select([group_project_table.c.data]).where(
@ -528,7 +528,7 @@ class SqlUpgradeTests(SqlMigrateBase):
base_data['project2']['id']))
r = session.execute(s)
data = json.loads(r.fetchone()['data'])
self.assertEqual(len(data['roles']), 2)
self.assertEqual(2, len(data['roles']))
self.assertIn({'id': base_data['roles'][4]['id']}, data['roles'])
self.assertIn({'id': base_data['roles'][5]['id']}, data['roles'])
@ -537,7 +537,7 @@ class SqlUpgradeTests(SqlMigrateBase):
(group_domain_table.c.domain_id == base_data['domain']['id']))
r = session.execute(s)
data = json.loads(r.fetchone()['data'])
self.assertEqual(len(data['roles']), 2)
self.assertEqual(2, len(data['roles']))
self.assertIn({'id': base_data['roles'][6]['id']}, data['roles'])
self.assertIn({'id': base_data['roles'][7]['id'],
'inherited_to': 'projects'}, data['roles'])
@ -547,7 +547,7 @@ class SqlUpgradeTests(SqlMigrateBase):
(user_domain_table.c.domain_id == base_data['domain']['id']))
r = session.execute(s)
data = json.loads(r.fetchone()['data'])
self.assertEqual(len(data['roles']), 1)
self.assertEqual(1, len(data['roles']))
self.assertIn({'id': base_data['roles'][8]['id'],
'inherited_to': 'projects'}, data['roles'])
@ -556,7 +556,7 @@ class SqlUpgradeTests(SqlMigrateBase):
(user_domain_table.c.domain_id == base_data['domain2']['id']))
r = session.execute(s)
data = json.loads(r.fetchone()['data'])
self.assertEqual(len(data['roles']), 2)
self.assertEqual(2, len(data['roles']))
self.assertIn({'id': base_data['roles'][6]['id']}, data['roles'])
self.assertIn({'id': base_data['roles'][7]['id']}, data['roles'])
@ -564,20 +564,20 @@ class SqlUpgradeTests(SqlMigrateBase):
def check_assignment_type(refs, type):
for ref in refs:
self.assertEqual(ref.type, type)
self.assertEqual(type, ref.type)
assignment_table = sqlalchemy.Table(
'assignment', self.metadata, autoload=True)
refs = session.query(assignment_table).all()
self.assertEqual(len(refs), 11)
self.assertEqual(11, len(refs))
q = session.query(assignment_table)
q = q.filter_by(actor_id=base_data['user']['id'])
q = q.filter_by(target_id=base_data['project']['id'])
refs = q.all()
self.assertEqual(len(refs), 1)
self.assertEqual(refs[0].role_id, base_data['roles'][0]['id'])
self.assertEqual(1, len(refs))
self.assertEqual(base_data['roles'][0]['id'], refs[0].role_id)
self.assertFalse(refs[0].inherited)
check_assignment_type(refs,
assignment_sql.AssignmentType.USER_PROJECT)
@ -586,7 +586,7 @@ class SqlUpgradeTests(SqlMigrateBase):
q = q.filter_by(actor_id=base_data['user']['id'])
q = q.filter_by(target_id=base_data['project2']['id'])
refs = q.all()
self.assertEqual(len(refs), 2)
self.assertEqual(2, len(refs))
role_ids = [base_data['roles'][1]['id'],
base_data['roles'][2]['id']]
self.assertIn(refs[0].role_id, role_ids)
@ -600,8 +600,8 @@ class SqlUpgradeTests(SqlMigrateBase):
q = q.filter_by(actor_id=base_data['group']['id'])
q = q.filter_by(target_id=base_data['project']['id'])
refs = q.all()
self.assertEqual(len(refs), 1)
self.assertEqual(refs[0].role_id, base_data['roles'][3]['id'])
self.assertEqual(1, len(refs))
self.assertEqual(base_data['roles'][3]['id'], refs[0].role_id)
self.assertFalse(refs[0].inherited)
check_assignment_type(refs,
assignment_sql.AssignmentType.GROUP_PROJECT)
@ -610,7 +610,7 @@ class SqlUpgradeTests(SqlMigrateBase):
q = q.filter_by(actor_id=base_data['group']['id'])
q = q.filter_by(target_id=base_data['project2']['id'])
refs = q.all()
self.assertEqual(len(refs), 2)
self.assertEqual(2, len(refs))
role_ids = [base_data['roles'][4]['id'],
base_data['roles'][5]['id']]
self.assertIn(refs[0].role_id, role_ids)
@ -624,7 +624,7 @@ class SqlUpgradeTests(SqlMigrateBase):
q = q.filter_by(actor_id=base_data['group']['id'])
q = q.filter_by(target_id=base_data['domain']['id'])
refs = q.all()
self.assertEqual(len(refs), 2)
self.assertEqual(2, len(refs))
role_ids = [base_data['roles'][6]['id'],
base_data['roles'][7]['id']]
self.assertIn(refs[0].role_id, role_ids)
@ -642,8 +642,8 @@ class SqlUpgradeTests(SqlMigrateBase):
q = q.filter_by(actor_id=base_data['user']['id'])
q = q.filter_by(target_id=base_data['domain']['id'])
refs = q.all()
self.assertEqual(len(refs), 1)
self.assertEqual(refs[0].role_id, base_data['roles'][8]['id'])
self.assertEqual(1, len(refs))
self.assertEqual(base_data['roles'][8]['id'], refs[0].role_id)
self.assertTrue(refs[0].inherited)
check_assignment_type(refs,
assignment_sql.AssignmentType.USER_DOMAIN)
@ -652,7 +652,7 @@ class SqlUpgradeTests(SqlMigrateBase):
q = q.filter_by(actor_id=base_data['user']['id'])
q = q.filter_by(target_id=base_data['domain2']['id'])
refs = q.all()
self.assertEqual(len(refs), 2)
self.assertEqual(2, len(refs))
role_ids = [base_data['roles'][6]['id'],
base_data['roles'][7]['id']]
self.assertIn(refs[0].role_id, role_ids)
@ -1319,7 +1319,7 @@ class SqlUpgradeTests(SqlMigrateBase):
"and TABLE_NAME!='migrate_version'" %
dict(database=database))
names = [x[0] for x in noninnodb]
self.assertEqual(names, [],
self.assertEqual([], names,
"Non-InnoDB tables exist")
connection.close()

24
keystone/tests/test_token_provider.py
View File

@ -727,13 +727,13 @@ class TestTokenProvider(tests.TestCase):
'bogus')
def test_default_token_format(self):
self.assertEqual(token.provider.Manager.get_token_provider(),
token.provider.PKIZ_PROVIDER)
self.assertEqual(token.provider.PKIZ_PROVIDER,
token.provider.Manager.get_token_provider())
def test_uuid_token_format_and_no_provider(self):
self.config_fixture.config(group='signing', token_format='UUID')
self.assertEqual(token.provider.Manager.get_token_provider(),
token.provider.UUID_PROVIDER)
self.assertEqual(token.provider.UUID_PROVIDER,
token.provider.Manager.get_token_provider())
def test_default_providers_without_token_format(self):
self.config_fixture.config(group='token',
@ -756,27 +756,27 @@ class TestTokenProvider(tests.TestCase):
def test_uuid_provider(self):
self.config_fixture.config(group='token',
provider=token.provider.UUID_PROVIDER)
self.assertEqual(token.provider.Manager.get_token_provider(),
token.provider.UUID_PROVIDER)
self.assertEqual(token.provider.UUID_PROVIDER,
token.provider.Manager.get_token_provider())
def test_provider_override_token_format(self):
self.config_fixture.config(
group='token',
provider='keystone.token.providers.pki.Test')
self.assertEqual(token.provider.Manager.get_token_provider(),
'keystone.token.providers.pki.Test')
self.assertEqual('keystone.token.providers.pki.Test',
token.provider.Manager.get_token_provider())
self.config_fixture.config(group='signing', token_format='UUID')
self.config_fixture.config(group='token',
provider=token.provider.UUID_PROVIDER)
self.assertEqual(token.provider.Manager.get_token_provider(),
token.provider.UUID_PROVIDER)
self.assertEqual(token.provider.UUID_PROVIDER,
token.provider.Manager.get_token_provider())
self.config_fixture.config(group='signing', token_format='PKI')
self.config_fixture.config(group='token',
provider=token.provider.PKI_PROVIDER)
self.assertEqual(token.provider.Manager.get_token_provider(),
token.provider.PKI_PROVIDER)
self.assertEqual(token.provider.PKI_PROVIDER,
token.provider.Manager.get_token_provider())
self.config_fixture.config(group='signing', token_format='CUSTOM')
self.config_fixture.config(group='token',

4
keystone/tests/test_url_middleware.py
View File

@ -44,10 +44,10 @@ class UrlMiddlewareTest(tests.TestCase):
self.middleware(req1.environ, self.start_fake_response)
self.middleware(req2.environ, self.start_fake_response)
self.assertEqual(req1.path_url, req2.path_url)
self.assertEqual(req1.path_url, 'http://localhost/v2.0/tokens')
self.assertEqual('http://localhost/v2.0/tokens', req1.path_url)
def test_rewrite_empty_path(self):
"""Tests empty path is rewritten to root."""
req = webob.Request.blank('')
self.middleware(req.environ, self.start_fake_response)
self.assertEqual(req.path_url, 'http://localhost/')
self.assertEqual('http://localhost/', req.path_url)

14
keystone/tests/test_utils.py
View File

@ -189,11 +189,11 @@ class LimitingReaderTests(tests.TestCase):
data = FakeData()
utils.LimitingReader(data, 100)
self.assertEqual(data.read(), 'helloworld')
self.assertEqual(len(data.read_args), 0)
self.assertEqual(len(data.read_kwargs), 0)
self.assertEqual('helloworld', data.read())
self.assertEqual(0, len(data.read_args))
self.assertEqual(0, len(data.read_kwargs))
self.assertEqual(data.read(10), 'helloworld')
self.assertEqual(len(data.read_args), 1)
self.assertEqual(len(data.read_kwargs), 0)
self.assertEqual(data.read_args[0], 10)
self.assertEqual('helloworld', data.read(10))
self.assertEqual(1, len(data.read_args))
self.assertEqual(0, len(data.read_kwargs))
self.assertEqual(10, data.read_args[0])

12
keystone/tests/test_v3_catalog.py
View File

@ -464,21 +464,21 @@ class CatalogTestCase(test_v3.RestfulTestCase):
# test the endpoint on v3
r = self.get('/endpoints')
endpoints = self.assertValidEndpointListResponse(r)
self.assertEqual(len(endpoints), 1)
self.assertEqual(1, len(endpoints))
endpoint_v3 = endpoints.pop()
# these attributes are identical between both APIs
self.assertEqual(endpoint_v3['region'], ref['region'])
self.assertEqual(endpoint_v3['service_id'], ref['service_id'])
self.assertEqual(endpoint_v3['description'], ref['description'])
self.assertEqual(ref['region'], endpoint_v3['region'])
self.assertEqual(ref['service_id'], endpoint_v3['service_id'])
self.assertEqual(ref['description'], endpoint_v3['description'])
# a v2 endpoint is not quite the same concept as a v3 endpoint, so they
# receive different identifiers
self.assertNotEqual(endpoint_v2['id'], endpoint_v3['id'])
# v2 has a publicurl; v3 has a url + interface type
self.assertEqual(endpoint_v3['url'], ref['publicurl'])
self.assertEqual(endpoint_v3['interface'], 'public')
self.assertEqual(ref['publicurl'], endpoint_v3['url'])
self.assertEqual('public', endpoint_v3['interface'])
# tests for bug 1152632 -- these attributes were being returned by v3
self.assertNotIn('publicurl', endpoint_v3)