openstack
/
keystone
Code Issues Proposed changes

Merge "Fix the order of assertEqual arguments(keystoneclient, kvs, etc)"

This commit is contained in:
Jenkins 2014-03-31 18:00:21 +00:00 committed by Gerrit Code Review
parent a2135440cc e6711264c4
commit c5a6ed1d5e
4 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
keystone/tests/test_keystoneclient.py
View File

@ -111,14 +111,14 @@ class KeystoneClientTests(object):
def test_authenticate_tenant_name_and_tenants(self):
client = self.get_client()
tenants = client.tenants.list()
self.assertEqual(tenants[0].id, self.tenant_bar['id'])
self.assertEqual(self.tenant_bar['id'], tenants[0].id)
def test_authenticate_tenant_id_and_tenants(self):
client = self._client(username=self.user_foo['name'],
password=self.user_foo['password'],
tenant_id='bar')
tenants = client.tenants.list()
self.assertEqual(tenants[0].id, self.tenant_bar['id'])
self.assertEqual(self.tenant_bar['id'], tenants[0].id)
def test_authenticate_invalid_tenant_id(self):
from keystoneclient import exceptions as client_exceptions
@ -133,14 +133,14 @@ class KeystoneClientTests(object):
token = client.auth_token
token_client = self._client(token=token)
tenants = token_client.tenants.list()
self.assertEqual(tenants[0].id, self.tenant_bar['id'])
self.assertEqual(self.tenant_bar['id'], tenants[0].id)
def test_authenticate_token_tenant_id(self):
client = self.get_client()
token = client.auth_token
token_client = self._client(token=token, tenant_id='bar')
tenants = token_client.tenants.list()
self.assertEqual(tenants[0].id, self.tenant_bar['id'])
self.assertEqual(self.tenant_bar['id'], tenants[0].id)
def test_authenticate_token_invalid_tenant_id(self):
from keystoneclient import exceptions as client_exceptions
@ -163,8 +163,8 @@ class KeystoneClientTests(object):
token = client.auth_token
token_client = self._client(token=token, tenant_name='BAR')
tenants = token_client.tenants.list()
self.assertEqual(tenants[0].id, self.tenant_bar['id'])
self.assertEqual(tenants[0].id, self.tenant_bar['id'])
self.assertEqual(self.tenant_bar['id'], tenants[0].id)
self.assertEqual(self.tenant_bar['id'], tenants[0].id)
def test_authenticate_and_delete_token(self):
from keystoneclient import exceptions as client_exceptions
@ -173,7 +173,7 @@ class KeystoneClientTests(object):
token = client.auth_token
token_client = self._client(token=token)
tenants = token_client.tenants.list()
self.assertEqual(tenants[0].id, self.tenant_bar['id'])
self.assertEqual(self.tenant_bar['id'], tenants[0].id)
client.tokens.delete(token_client.auth_token)
@ -262,19 +262,19 @@ class KeystoneClientTests(object):
tenant = client.tenants.create(tenant_name=tenant_name,
description=tenant_description,
enabled=tenant_enabled)
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant.enabled, tenant_enabled)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertEqual(tenant_enabled, tenant.enabled)
tenant = client.tenants.get(tenant_id=tenant.id)
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant.enabled, tenant_enabled)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertEqual(tenant_enabled, tenant.enabled)
tenant = [t for t in client.tenants.list() if t.id == tenant.id].pop()
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant.enabled, tenant_enabled)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertEqual(tenant_enabled, tenant.enabled)
# update, get, and list a tenant
tenant_name = 'updated_tenant'
@ -284,19 +284,19 @@ class KeystoneClientTests(object):
tenant_name=tenant_name,
enabled=tenant_enabled,
description=tenant_description)
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant.enabled, tenant_enabled)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertEqual(tenant_enabled, tenant.enabled)
tenant = client.tenants.get(tenant_id=tenant.id)
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant.enabled, tenant_enabled)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertEqual(tenant_enabled, tenant.enabled)
tenant = [t for t in client.tenants.list() if t.id == tenant.id].pop()
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant.enabled, tenant_enabled)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertEqual(tenant_enabled, tenant.enabled)
# delete, get, and list a tenant
client.tenants.delete(tenant=tenant.id)
@ -317,19 +317,19 @@ class KeystoneClientTests(object):
tenant = client.tenants.create(tenant_name,
description=tenant_description,
enabled=tenant_enabled)
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertIs(tenant.enabled, tenant_enabled)
tenant = client.tenants.get(tenant.id)
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertIs(tenant.enabled, tenant_enabled)
# multiple tenants exist due to fixtures, so find the one we're testing
tenant = [t for t in client.tenants.list() if t.id == tenant.id].pop()
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertIs(tenant.enabled, tenant_enabled)
# update, get, and list a tenant
@ -340,18 +340,18 @@ class KeystoneClientTests(object):
tenant_name=tenant_name,
enabled=tenant_enabled,
description=tenant_description)
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertIs(tenant.enabled, tenant_enabled)
tenant = client.tenants.get(tenant.id)
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertIs(tenant.enabled, tenant_enabled)
tenant = [t for t in client.tenants.list() if t.id == tenant.id].pop()
self.assertEqual(tenant.name, tenant_name)
self.assertEqual(tenant.description, tenant_description)
self.assertEqual(tenant_name, tenant.name)
self.assertEqual(tenant_description, tenant.description)
self.assertIs(tenant.enabled, tenant_enabled)
# delete, get, and list a tenant
@ -392,12 +392,12 @@ class KeystoneClientTests(object):
def test_tenant_list(self):
client = self.get_client()
tenants = client.tenants.list()
self.assertEqual(len(tenants), 1)
self.assertEqual(1, len(tenants))
# Admin endpoint should return *all* tenants
client = self.get_client(admin=True)
tenants = client.tenants.list()
self.assertEqual(len(tenants), len(default_fixtures.TENANTS))
self.assertEqual(len(default_fixtures.TENANTS), len(tenants))
def test_invalid_password(self):
from keystoneclient import exceptions as client_exceptions
@ -546,15 +546,15 @@ class KeystoneClientTests(object):
user = client.users.create(name=test_username,
password='password',
email='user1@test.com')
self.assertEqual(user.name, test_username)
self.assertEqual(test_username, user.name)
user = client.users.get(user=user.id)
self.assertEqual(user.name, test_username)
self.assertEqual(test_username, user.name)
user = client.users.update(user=user,
name=test_username,
email='user2@test.com')
self.assertEqual(user.email, 'user2@test.com')
self.assertEqual('user2@test.com', user.email)
# NOTE(termie): update_enabled doesn't return anything, probably a bug
client.users.update_enabled(user=user, enabled=False)
@ -586,7 +586,7 @@ class KeystoneClientTests(object):
password='password',
email='user1@test.com',
tenant_id='bar')
self.assertEqual(user2.name, test_username)
self.assertEqual(test_username, user2.name)
def test_update_default_tenant_to_existing_value(self):
client = self.get_client(admin=True)
@ -687,7 +687,7 @@ class KeystoneClientTests(object):
def test_role_get(self):
client = self.get_client(admin=True)
role = client.roles.get(role=self.role_admin['id'])
self.assertEqual(role.id, self.role_admin['id'])
self.assertEqual(self.role_admin['id'], role.id)
def test_role_crud(self):
from keystoneclient import exceptions as client_exceptions
@ -695,10 +695,10 @@ class KeystoneClientTests(object):
test_role = 'new_role'
client = self.get_client(admin=True)
role = client.roles.create(name=test_role)
self.assertEqual(role.name, test_role)
self.assertEqual(test_role, role.name)
role = client.roles.get(role=role.id)
self.assertEqual(role.name, test_role)
self.assertEqual(test_role, role.name)
client.roles.delete(role=role.id)
@ -786,7 +786,7 @@ class KeystoneClientTests(object):
client.services.get,
id=service.id)
services = [x for x in client.services.list() if x.id == service.id]
self.assertEqual(len(services), 0)
self.assertEqual(0, len(services))
def test_service_delete_404(self):
from keystoneclient import exceptions as client_exceptions
@ -936,12 +936,12 @@ class KeystoneClientTests(object):
self.user_foo['id'])
tenants = client.tenants.list()
self.assertEqual(len(tenants), 3)
self.assertEqual(3, len(tenants))
tenants_marker = client.tenants.list(marker=tenants[0].id)
self.assertEqual(len(tenants_marker), 2)
self.assertEqual(tenants[1].name, tenants_marker[0].name)
self.assertEqual(tenants[2].name, tenants_marker[1].name)
self.assertEqual(2, len(tenants_marker))
self.assertEqual(tenants_marker[0].name, tenants[1].name)
self.assertEqual(tenants_marker[1].name, tenants[2].name)
def test_tenant_list_marker_not_found(self):
from keystoneclient import exceptions as client_exceptions
@ -963,10 +963,10 @@ class KeystoneClientTests(object):
self.user_foo['id'])
tenants = client.tenants.list()
self.assertEqual(len(tenants), 3)
self.assertEqual(3, len(tenants))
tenants_limited = client.tenants.list(limit=2)
self.assertEqual(len(tenants_limited), 2)
self.assertEqual(2, len(tenants_limited))
self.assertEqual(tenants[0].name, tenants_limited[0].name)
self.assertEqual(tenants[1].name, tenants_limited[1].name)

26
keystone/tests/test_keystoneclient_sql.py
View File

@ -66,11 +66,11 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
adminurl=endpoint_adminurl,
internalurl=endpoint_internalurl)
self.assertEqual(endpoint.region, endpoint_region)
self.assertEqual(endpoint.service_id, service.id)
self.assertEqual(endpoint.publicurl, endpoint_publicurl)
self.assertEqual(endpoint.internalurl, endpoint_internalurl)
self.assertEqual(endpoint.adminurl, endpoint_adminurl)
self.assertEqual(endpoint_region, endpoint.region)
self.assertEqual(service.id, endpoint.service_id)
self.assertEqual(endpoint_publicurl, endpoint.publicurl)
self.assertEqual(endpoint_internalurl, endpoint.internalurl)
self.assertEqual(endpoint_adminurl, endpoint.adminurl)
client.endpoints.delete(id=endpoint.id)
self.assertRaises(client_exceptions.NotFound, client.endpoints.delete,
@ -105,7 +105,7 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
credentials, signature = self._generate_default_user_ec2_credentials()
credentials['signature'] = signature
resp, token = self._send_ec2_auth_request(credentials)
self.assertEqual(resp.status_code, 200)
self.assertEqual(200, resp.status_code)
self.assertIn('access', token)
def test_ec2_auth_success_trust(self):
@ -137,7 +137,7 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
cred.access, cred.secret)
credentials['signature'] = signature
resp, token = self._send_ec2_auth_request(credentials)
self.assertEqual(resp.status_code, 200)
self.assertEqual(200, resp.status_code)
self.assertEqual(trust_id, token['access']['trust']['id'])
# TODO(shardy) we really want to check the roles and trustee
# but because of where the stubbing happens we don't seem to
@ -156,7 +156,7 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
def test_ec2_credential_crud(self):
creds = self.default_client.ec2.list(user_id=self.user_foo['id'])
self.assertEqual(creds, [])
self.assertEqual([], creds)
cred = self.default_client.ec2.create(user_id=self.user_foo['id'],
tenant_id=self.tenant_bar['id'])
@ -169,12 +169,12 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
self.default_client.ec2.delete(user_id=self.user_foo['id'],
access=cred.access)
creds = self.default_client.ec2.list(user_id=self.user_foo['id'])
self.assertEqual(creds, [])
self.assertEqual([], creds)
def test_ec2_credential_crud_non_admin(self):
na_client = self.get_client(self.user_two)
creds = na_client.ec2.list(user_id=self.user_two['id'])
self.assertEqual(creds, [])
self.assertEqual([], creds)
cred = na_client.ec2.create(user_id=self.user_two['id'],
tenant_id=self.tenant_baz['id'])
@ -187,7 +187,7 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
na_client.ec2.delete(user_id=self.user_two['id'],
access=cred.access)
creds = na_client.ec2.list(user_id=self.user_two['id'])
self.assertEqual(creds, [])
self.assertEqual([], creds)
def test_ec2_list_credentials(self):
cred_1 = self.default_client.ec2.create(
@ -203,7 +203,7 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
cred_4 = two.ec2.create(user_id=self.user_two['id'],
tenant_id=self.tenant_bar['id'])
creds = self.default_client.ec2.list(user_id=self.user_foo['id'])
self.assertEqual(len(creds), 3)
self.assertEqual(3, len(creds))
self.assertEqual(sorted([cred_1, cred_2, cred_3],
key=lambda x: x.access),
sorted(creds, key=lambda x: x.access))
@ -365,7 +365,7 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
client.policies.get,
policy=policy.id)
policies = [x for x in client.policies.list() if x.id == policy.id]
self.assertEqual(len(policies), 0)
self.assertEqual(0, len(policies))
class KcOptTestCase(KcMasterSqlTestCase):

46
keystone/tests/test_kvs.py
View File

@ -176,14 +176,14 @@ class KVSTest(tests.TestCase):
kvs.configure('openstack.kvs.Memory')
self.assertIsInstance(kvs._region.backend, inmemdb.MemoryBackend)
self.assertEqual(kvs._region.name, region_one)
self.assertEqual(region_one, kvs._region.name)
kvs = self._get_kvs_region(region_two)
kvs.configure('openstack.kvs.KVSBackendFixture',
test_arg=test_arg)
self.assertEqual(kvs._region.name, region_two)
self.assertEqual(kvs._region.backend.test_arg, test_arg)
self.assertEqual(region_two, kvs._region.name)
self.assertEqual(test_arg, kvs._region.backend.test_arg)
def test_kvs_proxy_configuration(self):
# Test that proxies are applied correctly and in the correct (reverse)
@ -252,7 +252,7 @@ class KVSTest(tests.TestCase):
kvs.set(self.key_bar, self.value_bar)
returned_value = kvs.get(self.key_bar)
# The returned value should be the same value as the value in .set
self.assertEqual(returned_value, self.value_bar)
self.assertEqual(self.value_bar, returned_value)
# The value should not be the exact object used in .set
self.assertIsNot(returned_value, self.value_bar)
kvs.delete(self.key_bar)
@ -267,7 +267,7 @@ class KVSTest(tests.TestCase):
self.key_bar: self.value_bar})
# Returned value from get_multi should be a list of the values of the
# keys
self.assertEqual(kvs.get_multi(keys), expected)
self.assertEqual(expected, kvs.get_multi(keys))
# Delete both keys
kvs.delete_multi(keys)
# make sure that NotFound is properly raised when trying to get the now
@ -501,11 +501,11 @@ class KVSTest(tests.TestCase):
self.assertDictEqual(
kvs._region.backend.driver.client.set_arguments_passed,
expected_set_args)
self.assertEqual(kvs._region.backend.driver.client.keys_values.keys(),
expected_foo_keys)
self.assertEqual(expected_foo_keys,
kvs._region.backend.driver.client.keys_values.keys())
self.assertEqual(
kvs._region.backend.driver.client.keys_values[self.key_foo][0],
self.value_foo)
self.value_foo,
kvs._region.backend.driver.client.keys_values[self.key_foo][0])
# Set a key that would not have an expiry and verify the correct result
# occurred and that the correct set_arguments were passed.
@ -513,11 +513,11 @@ class KVSTest(tests.TestCase):
self.assertDictEqual(
kvs._region.backend.driver.client.set_arguments_passed,
expected_no_expiry_args)
self.assertEqual(kvs._region.backend.driver.client.keys_values.keys(),
expected_bar_keys)
self.assertEqual(expected_bar_keys,
kvs._region.backend.driver.client.keys_values.keys())
self.assertEqual(
kvs._region.backend.driver.client.keys_values[self.key_bar][0],
self.value_bar)
self.value_bar,
kvs._region.backend.driver.client.keys_values[self.key_bar][0])
# set_multi a dict that would have an expiry and verify the correct
# result occurred and that the correct set_arguments were passed.
@ -525,11 +525,11 @@ class KVSTest(tests.TestCase):
self.assertDictEqual(
kvs._region.backend.driver.client.set_arguments_passed,
expected_set_args)
self.assertEqual(kvs._region.backend.driver.client.keys_values.keys(),
expected_foo_keys)
self.assertEqual(expected_foo_keys,
kvs._region.backend.driver.client.keys_values.keys())
self.assertEqual(
kvs._region.backend.driver.client.keys_values[self.key_foo][0],
self.value_foo)
self.value_foo,
kvs._region.backend.driver.client.keys_values[self.key_foo][0])
# set_multi a dict that would not have an expiry and verify the correct
# result occurred and that the correct set_arguments were passed.
@ -537,11 +537,11 @@ class KVSTest(tests.TestCase):
self.assertDictEqual(
kvs._region.backend.driver.client.set_arguments_passed,
expected_no_expiry_args)
self.assertEqual(kvs._region.backend.driver.client.keys_values.keys(),
expected_bar_keys)
self.assertEqual(expected_bar_keys,
kvs._region.backend.driver.client.keys_values.keys())
self.assertEqual(
kvs._region.backend.driver.client.keys_values[self.key_bar][0],
self.value_bar)
self.value_bar,
kvs._region.backend.driver.client.keys_values[self.key_bar][0])
def test_memcached_lock_max_lock_attempts(self):
kvs = self._get_kvs_region()
@ -552,8 +552,8 @@ class KVSTest(tests.TestCase):
memcached_backend='TestDriver',
max_lock_attempts=max_lock_attempts)
self.assertEqual(kvs._region.backend.max_lock_attempts,
max_lock_attempts)
self.assertEqual(max_lock_attempts,
kvs._region.backend.max_lock_attempts)
# Simple Lock success test
with kvs.get_lock(test_key) as lock:
kvs.set(test_key, 'testing', lock)

22
keystone/tests/test_middleware.py
View File

@ -47,7 +47,7 @@ class TokenAuthMiddlewareTest(tests.TestCase):
req.headers[middleware.AUTH_TOKEN_HEADER] = 'MAGIC'
middleware.TokenAuthMiddleware(None).process_request(req)
context = req.environ[middleware.CONTEXT_ENV]
self.assertEqual(context['token_id'], 'MAGIC')
self.assertEqual('MAGIC', context['token_id'])
class AdminTokenAuthMiddlewareTest(tests.TestCase):
@ -71,7 +71,7 @@ class PostParamsMiddlewareTest(tests.TestCase):
req = make_request(body="arg1=one", method='POST')
middleware.PostParamsMiddleware(None).process_request(req)
params = req.environ[middleware.PARAMS_ENV]
self.assertEqual(params, {"arg1": "one"})
self.assertEqual({"arg1": "one"}, params)
class JsonBodyMiddlewareTest(tests.TestCase):
@ -81,35 +81,35 @@ class JsonBodyMiddlewareTest(tests.TestCase):
method='POST')
middleware.JsonBodyMiddleware(None).process_request(req)
params = req.environ[middleware.PARAMS_ENV]
self.assertEqual(params, {"arg1": "one", "arg2": ["a"]})
self.assertEqual({"arg1": "one", "arg2": ["a"]}, params)
def test_malformed_json(self):
req = make_request(body='{"arg1": "on',
content_type='application/json',
method='POST')
resp = middleware.JsonBodyMiddleware(None).process_request(req)
self.assertEqual(resp.status_int, 400)
self.assertEqual(400, resp.status_int)
def test_no_content_type(self):
req = make_request(body='{"arg1": "one", "arg2": ["a"]}',
method='POST')
middleware.JsonBodyMiddleware(None).process_request(req)
params = req.environ[middleware.PARAMS_ENV]
self.assertEqual(params, {"arg1": "one", "arg2": ["a"]})
self.assertEqual({"arg1": "one", "arg2": ["a"]}, params)
def test_unrecognized_content_type(self):
req = make_request(body='{"arg1": "one", "arg2": ["a"]}',
content_type='text/plain',
method='POST')
resp = middleware.JsonBodyMiddleware(None).process_request(req)
self.assertEqual(resp.status_int, 400)
self.assertEqual(400, resp.status_int)
def test_unrecognized_content_type_without_body(self):
req = make_request(content_type='text/plain',
method='GET')
middleware.JsonBodyMiddleware(None).process_request(req)
params = req.environ.get(middleware.PARAMS_ENV, {})
self.assertEqual(params, {})
self.assertEqual({}, params)
class XmlBodyMiddlewareTest(tests.TestCase):
@ -120,7 +120,7 @@ class XmlBodyMiddlewareTest(tests.TestCase):
middleware.XmlBodyMiddleware(None).process_request(req)
resp = make_response(body=body)
middleware.XmlBodyMiddleware(None).process_response(req, resp)
self.assertEqual(resp.content_type, 'application/xml')
self.assertEqual('application/xml', resp.content_type)
def test_client_wants_json_back(self):
"""Clients requesting JSON should definitely not get XML back."""
@ -147,7 +147,7 @@ class XmlBodyMiddlewareTest(tests.TestCase):
content_type='application/xml',
method='POST')
middleware.XmlBodyMiddleware(None).process_request(req)
self.assertEqual(req.content_type, 'application/json')
self.assertEqual('application/json', req.content_type)
self.assertTrue(jsonutils.loads(req.body))
def test_json_unnaffected(self):
@ -156,5 +156,5 @@ class XmlBodyMiddlewareTest(tests.TestCase):
body = '{"container": {"attribute": "value"}}'
req = make_request(body=body, content_type=content_type, method='POST')
middleware.XmlBodyMiddleware(None).process_request(req)
self.assertEqual(req.body, body)
self.assertEqual(req.content_type, content_type)
self.assertEqual(body, req.body)
self.assertEqual(content_type, req.content_type)