openstack
/
deb-keystone
Code Issues Proposed changes

Merge "Fix order of arguments in assertIs"

This commit is contained in:
Jenkins 2016-09-12 10:03:16 +00:00 committed by Gerrit Code Review
parent 9e231ea417 fe12aaf135
commit d1a761293a
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/tests/unit/auth/test_controllers.py
View File

@ -53,7 +53,7 @@ class TestLoadAuthMethod(unit.BaseTestCase):
self.assertEqual(auth_plugin_namespace, fake_driver_manager.namespace)
driver_manager_mock.assert_called_once_with(
auth_plugin_namespace, plugin_name, invoke_on_load=True)
self.assertIs(driver, mock.sentinel.driver)
self.assertIs(mock.sentinel.driver, driver)
def test_entrypoint_fails_import_works(self):
method = uuid.uuid4().hex
@ -73,7 +73,7 @@ class TestLoadAuthMethod(unit.BaseTestCase):
importutils, 'import_object', return_value=mock.sentinel.driver))
driver = controllers.load_auth_method(method)
self.assertIs(driver, mock.sentinel.driver)
self.assertIs(mock.sentinel.driver, driver)
def test_entrypoint_fails_import_fails(self):
method = uuid.uuid4().hex

2
keystone/tests/unit/identity/backends/test_ldap_common.py
View File

@ -452,7 +452,7 @@ class CommonLdapTestCase(unit.BaseTestCase):
py_result = common_ldap.convert_ldap_result(result)
# The user id should be 0123456, and the enabled
# flag should be True
self.assertIs(py_result[0][1]['enabled'][0], True)
self.assertIs(True, py_result[0][1]['enabled'][0])
self.assertEqual(user_id, py_result[0][1]['user_id'][0])
def test_user_id_begins_with_0_and_enabled_bit_mask(self):

2
keystone/tests/unit/identity/test_backends.py
View File

@ -527,7 +527,7 @@ class IdentityTests(object):
# NOTE(breton): below, attribute `enabled` is explicitly tested to be
# equal True. assertTrue should not be used, because it converts
# the passed value to bool().
self.assertIs(user_ref['enabled'], True)
self.assertIs(True, user_ref['enabled'])
def test_update_user_name(self):
user = unit.new_user_ref(domain_id=CONF.identity.default_domain_id)

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

@ -1034,7 +1034,7 @@ class AuthWithTrust(object):
request, trust=self.sample_data)['trust']
self.assertEqual(self.trustor['id'], new_trust['trustor_user_id'])
self.assertEqual(self.trustee['id'], new_trust['trustee_user_id'])
self.assertIs(new_trust['impersonation'], True)
self.assertIs(True, new_trust['impersonation'])
auth_response = self.fetch_v2_token_from_trust(new_trust)
token_user = auth_response['access']['user']
self.assertEqual(token_user['id'], new_trust['trustor_user_id'])
@ -1058,7 +1058,7 @@ class AuthWithTrust(object):
expires_at=None, impersonation=False)
self.assertEqual(self.trustor['id'], new_trust['trustor_user_id'])
self.assertEqual(self.trustee['id'], new_trust['trustee_user_id'])
self.assertIs(new_trust['impersonation'], False)
self.assertIs(False, new_trust['impersonation'])
auth_response = self.fetch_v2_token_from_trust(new_trust)
token_user = auth_response['access']['user']
self.assertEqual(token_user['id'], new_trust['trustee_user_id'])
@ -1067,7 +1067,7 @@ class AuthWithTrust(object):
new_trust = self.create_trust(self.sample_data, self.trustor['name'])
self.assertEqual(self.trustor['id'], new_trust['trustor_user_id'])
self.assertEqual(self.trustee['id'], new_trust['trustee_user_id'])
self.assertIs(new_trust['impersonation'], True)
self.assertIs(True, new_trust['impersonation'])
auth_response = self.fetch_v2_token_from_trust(new_trust)
token_user = auth_response['access']['user']
self.assertEqual(token_user['id'], new_trust['trustor_user_id'])

12
keystone/tests/unit/test_backend_ldap.py
View File

@ -1237,38 +1237,38 @@ class LDAPIdentity(BaseLDAPIdentity, unit.TestCase):
# Use assertIs rather than assertTrue because assertIs will assert the
# value is a Boolean as expected.
self.assertIs(user_ref['enabled'], True)
self.assertIs(True, user_ref['enabled'])
self.assertNotIn('enabled_nomask', user_ref)
enabled_vals = self.get_user_enabled_vals(user_ref)
self.assertEqual([512], enabled_vals)
user_ref = self.identity_api.get_user(user_ref['id'])
self.assertIs(user_ref['enabled'], True)
self.assertIs(True, user_ref['enabled'])
self.assertNotIn('enabled_nomask', user_ref)
user['enabled'] = False
user_ref = self.identity_api.update_user(user_ref['id'], user)
self.assertIs(user_ref['enabled'], False)
self.assertIs(False, user_ref['enabled'])
self.assertNotIn('enabled_nomask', user_ref)
enabled_vals = self.get_user_enabled_vals(user_ref)
self.assertEqual([514], enabled_vals)
user_ref = self.identity_api.get_user(user_ref['id'])
self.assertIs(user_ref['enabled'], False)
self.assertIs(False, user_ref['enabled'])
self.assertNotIn('enabled_nomask', user_ref)
user['enabled'] = True
user_ref = self.identity_api.update_user(user_ref['id'], user)
self.assertIs(user_ref['enabled'], True)
self.assertIs(True, user_ref['enabled'])
self.assertNotIn('enabled_nomask', user_ref)
enabled_vals = self.get_user_enabled_vals(user_ref)
self.assertEqual([512], enabled_vals)
user_ref = self.identity_api.get_user(user_ref['id'])
self.assertIs(user_ref['enabled'], True)
self.assertIs(True, user_ref['enabled'])
self.assertNotIn('enabled_nomask', user_ref)
def test_user_enabled_invert(self):

2
keystone/tests/unit/test_cli.py
View File

@ -121,7 +121,7 @@ class CliBootStrapTestCase(unit.SQLDriverOverrides, unit.TestCase):
bootstrap.assignment_manager.get_roles_for_user_and_project(
user['id'],
project['id']))
self.assertIs(len(role_list), 1)
self.assertIs(1, len(role_list))
self.assertEqual(role_list[0], role['id'])
# NOTE(morganfainberg): Pass an empty context, it isn't used by
# `authenticate` method.