Change assert(Not)Equals to assert(Not)Equal
According to http://docs.python.org/2/library/unittest.html assert(Not)Equals is a deprecated alias of assert(Not)Equal. Change-Id: If552f49edaeb3e3c387e47aa62add902c6fa6c52 Closes-Bug: #1329757
This commit is contained in:
guanzuoyu
Adrian Turjak
parent
424f38c5e4
commit
efdb2ae24d
|
|
@ -109,13 +109,13 @@ class MiscActionTests(AdjutantTestCase):
|
|||
action = SendAdditionalEmailAction({}, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
task.cache["additional_emails"] = ["thisguy@righthere.com",
|
||||
"nope@example.com"]
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEqual(len(mail.outbox), 0)
|
||||
self.assertTrue(
|
||||
|
|
@ -123,7 +123,7 @@ class MiscActionTests(AdjutantTestCase):
|
|||
action.action.task.action_notes['SendAdditionalEmailAction'][1])
|
||||
|
||||
action.submit({})
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
@modify_dict_settings(DEFAULT_ACTION_SETTINGS={
|
||||
'operation': 'update',
|
||||
|
|
@ -149,20 +149,20 @@ class MiscActionTests(AdjutantTestCase):
|
|||
action = SendAdditionalEmailAction({}, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
task.cache["additional_emails"] = ["thisguy@righthere.com",
|
||||
"nope@example.com"]
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEqual(len(mail.outbox), 1)
|
||||
self.assertEqual(set(mail.outbox[0].to),
|
||||
set(["thisguy@righthere.com", "nope@example.com"]))
|
||||
|
||||
action.submit({})
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
self.assertEqual(len(mail.outbox), 1)
|
||||
|
||||
@modify_dict_settings(DEFAULT_ACTION_SETTINGS={
|
||||
|
|
@ -189,15 +189,15 @@ class MiscActionTests(AdjutantTestCase):
|
|||
action = SendAdditionalEmailAction({}, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEqual(len(mail.outbox), 0)
|
||||
|
||||
action.submit({})
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
@modify_dict_settings(DEFAULT_ACTION_SETTINGS={
|
||||
'operation': 'update',
|
||||
|
|
@ -223,15 +223,15 @@ class MiscActionTests(AdjutantTestCase):
|
|||
action = SendAdditionalEmailAction({}, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEqual(len(mail.outbox), 1)
|
||||
self.assertEqual(mail.outbox[0].to,
|
||||
["anadminwhocares@example.com"])
|
||||
|
||||
action.submit({})
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
self.assertEqual(len(mail.outbox), 1)
|
||||
|
|
|
|||
|
|
@ -56,32 +56,32 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
|
||||
new_user = fake_clients.identity_cache['new_users'][0]
|
||||
self.assertEquals(new_user.name, 'test@example.com')
|
||||
self.assertEquals(new_user.email, 'test@example.com')
|
||||
self.assertEqual(new_user.name, 'test@example.com')
|
||||
self.assertEqual(new_user.email, 'test@example.com')
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
task.cache,
|
||||
{'project_id': new_project.id, 'user_id': new_user.id,
|
||||
'user_state': 'default'})
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(new_user.password, '123456')
|
||||
self.assertEqual(new_user.password, '123456')
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
roles = fake_client._get_roles_as_names(new_user, new_project)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
sorted(roles),
|
||||
sorted(['_member_', 'project_admin',
|
||||
'project_mod', 'heat_stack_owner']))
|
||||
|
|
@ -109,43 +109,43 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
|
||||
new_user = fake_clients.identity_cache['new_users'][0]
|
||||
self.assertEquals(new_user.name, 'test@example.com')
|
||||
self.assertEquals(new_user.email, 'test@example.com')
|
||||
self.assertEqual(new_user.name, 'test@example.com')
|
||||
self.assertEqual(new_user.email, 'test@example.com')
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
task.cache,
|
||||
{'project_id': new_project.id, 'user_id': new_user.id,
|
||||
'user_state': 'default'})
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
self.assertEqual(
|
||||
len(fake_clients.identity_cache['new_projects']), 1)
|
||||
self.assertEqual(
|
||||
len(fake_clients.identity_cache['new_users']), 1)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
task.cache,
|
||||
{'project_id': new_project.id, 'user_id': new_user.id,
|
||||
'user_state': 'default'})
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(new_user.password, '123456')
|
||||
self.assertEqual(new_user.password, '123456')
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
roles = fake_client._get_roles_as_names(new_user, new_project)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
sorted(roles),
|
||||
sorted(['_member_', 'project_admin',
|
||||
'project_mod', 'heat_stack_owner']))
|
||||
|
|
@ -174,7 +174,7 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
# NOTE(adrian): We need the code to fail at the
|
||||
# grant roles step so we can attempt reapproving it
|
||||
|
|
@ -195,31 +195,31 @@ class ProjectActionTests(TestCase):
|
|||
self.assertTrue("user_id" in action.action.cache)
|
||||
self.assertFalse("roles_granted" in action.action.cache)
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
|
||||
new_user = fake_clients.identity_cache['new_users'][0]
|
||||
self.assertEquals(new_user.name, 'test@example.com')
|
||||
self.assertEquals(new_user.email, 'test@example.com')
|
||||
self.assertEquals(
|
||||
self.assertEqual(new_user.name, 'test@example.com')
|
||||
self.assertEqual(new_user.email, 'test@example.com')
|
||||
self.assertEqual(
|
||||
len(fake_clients.identity_cache['role_assignments']), 0)
|
||||
|
||||
# And then swap back the correct function
|
||||
action.grant_roles = old_grant_function
|
||||
# and try again, it should work this time
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
# roles_granted in cache
|
||||
self.assertTrue("roles_granted" in action.action.cache)
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(new_user.password, '123456')
|
||||
self.assertEqual(new_user.password, '123456')
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
roles = fake_client._get_roles_as_names(new_user, new_project)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
sorted(roles),
|
||||
sorted(['_member_', 'project_admin',
|
||||
'project_mod', 'heat_stack_owner']))
|
||||
|
|
@ -249,31 +249,31 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
|
||||
self.assertEqual(
|
||||
len(fake_clients.identity_cache['new_users']), 0)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
task.cache,
|
||||
{'project_id': new_project.id, 'user_id': user.id,
|
||||
'user_state': 'existing'})
|
||||
|
||||
# submit does nothing for existing
|
||||
action.submit({})
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(user.password, '123')
|
||||
self.assertEqual(user.password, '123')
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
roles = fake_client._get_roles_as_names(user, new_project)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
sorted(roles),
|
||||
sorted(['_member_', 'project_admin',
|
||||
'project_mod', 'heat_stack_owner']))
|
||||
|
|
@ -306,18 +306,18 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
fake_clients.identity_cache['projects'].get('test_project'),
|
||||
None)
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
def test_new_project_project_removed(self):
|
||||
"""
|
||||
|
|
@ -341,19 +341,19 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
|
||||
fake_clients.identity_cache['projects'] = {}
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
def test_new_project_user_removed(self):
|
||||
"""
|
||||
|
|
@ -377,20 +377,20 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_user = fake_clients.identity_cache['new_users'][0]
|
||||
self.assertEquals(new_user.name, 'test@example.com')
|
||||
self.assertEquals(new_user.email, 'test@example.com')
|
||||
self.assertEqual(new_user.name, 'test@example.com')
|
||||
self.assertEqual(new_user.email, 'test@example.com')
|
||||
|
||||
fake_clients.identity_cache['users'] = {}
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
def test_new_project_disabled_user(self):
|
||||
"""
|
||||
|
|
@ -419,41 +419,41 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
|
||||
self.assertEqual(
|
||||
len(fake_clients.identity_cache['new_users']), 0)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
task.cache,
|
||||
{'user_id': user.id,
|
||||
'project_id': new_project.id,
|
||||
'user_state': 'disabled'})
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
action.action.cache["token_fields"],
|
||||
['password'])
|
||||
|
||||
# submit password reset
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(user.password, '123456')
|
||||
self.assertEqual(user.password, '123456')
|
||||
|
||||
# check that user has been enabled correctly
|
||||
self.assertEquals(user.email, 'test@example.com')
|
||||
self.assertEquals(user.enabled, True)
|
||||
self.assertEqual(user.email, 'test@example.com')
|
||||
self.assertEqual(user.enabled, True)
|
||||
|
||||
# Check user has correct roles in new project
|
||||
fake_client = fake_clients.FakeManager()
|
||||
roles = fake_client._get_roles_as_names(user, new_project)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
sorted(roles),
|
||||
sorted(['_member_', 'project_admin',
|
||||
'project_mod', 'heat_stack_owner']))
|
||||
|
|
@ -485,7 +485,7 @@ class ProjectActionTests(TestCase):
|
|||
# Sign up
|
||||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
# Create the disabled user directly with the Identity Manager.
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
|
@ -501,35 +501,35 @@ class ProjectActionTests(TestCase):
|
|||
|
||||
# approve previous signup
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
|
||||
self.assertEqual(
|
||||
len(fake_clients.identity_cache['new_users']), 1)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
task.cache,
|
||||
{'user_id': user.id,
|
||||
'project_id': new_project.id,
|
||||
'user_state': 'disabled'})
|
||||
|
||||
# check that user has been re-enabled with a generated password.
|
||||
self.assertEquals(user.enabled, True)
|
||||
self.assertNotEquals(user.password, 'origpass')
|
||||
self.assertEqual(user.enabled, True)
|
||||
self.assertNotEqual(user.password, 'origpass')
|
||||
|
||||
# submit password reset
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
# Ensure user has new password:
|
||||
self.assertEquals(user.password, '123456')
|
||||
self.assertEqual(user.password, '123456')
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
roles = fake_client._get_roles_as_names(user, new_project)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
sorted(roles),
|
||||
sorted(['_member_', 'project_admin',
|
||||
'project_mod', 'heat_stack_owner']))
|
||||
|
|
@ -561,10 +561,10 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
def test_new_project_invalid_domain_id(self):
|
||||
""" Create a project using an invalid domain """
|
||||
|
|
@ -589,10 +589,10 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
@override_settings(USERNAME_IS_EMAIL=False)
|
||||
def test_new_project_email_not_username(self):
|
||||
|
|
@ -621,32 +621,32 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectWithUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
|
||||
new_user = fake_clients.identity_cache['new_users'][0]
|
||||
self.assertEquals(new_user.name, 'test_user')
|
||||
self.assertEquals(new_user.email, 'test@example.com')
|
||||
self.assertEqual(new_user.name, 'test_user')
|
||||
self.assertEqual(new_user.email, 'test@example.com')
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
task.cache,
|
||||
{'project_id': new_project.id, 'user_id': new_user.id,
|
||||
'user_state': 'default'})
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(new_user.password, '123456')
|
||||
self.assertEqual(new_user.password, '123456')
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
roles = fake_client._get_roles_as_names(new_user, new_project)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
sorted(roles),
|
||||
sorted(['_member_', 'project_admin',
|
||||
'project_mod', 'heat_stack_owner']))
|
||||
|
|
@ -678,15 +678,15 @@ class ProjectActionTests(TestCase):
|
|||
{'domain_id': 'default'}, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
user = fake_client.find_user('admin', 'default')
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['admin'])
|
||||
self.assertEqual(roles, ['admin'])
|
||||
|
||||
def test_add_default_users_invalid_project(self):
|
||||
"""Add default users to a project that doesn't exist.
|
||||
|
|
@ -705,11 +705,11 @@ class ProjectActionTests(TestCase):
|
|||
{'domain_id': 'default'}, task=task, order=1)
|
||||
action.pre_approve()
|
||||
# No need to test project yet - it's ok if it doesn't exist
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
# Now the missing project should make the action invalid
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
@modify_dict_settings(DEFAULT_ACTION_SETTINGS={
|
||||
'key_list': ['AddDefaultUsersToProjectAction'],
|
||||
|
|
@ -733,21 +733,21 @@ class ProjectActionTests(TestCase):
|
|||
{'domain_id': 'default'}, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
user = fake_client.find_user('admin', 'default')
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['admin'])
|
||||
self.assertEqual(roles, ['admin'])
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['admin'])
|
||||
self.assertEqual(roles, ['admin'])
|
||||
|
||||
def test_new_project_action(self):
|
||||
"""
|
||||
|
|
@ -777,24 +777,24 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEquals(new_project.parent_id, project.id)
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.parent_id, project.id)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
roles = fake_client._get_roles_as_names(user, new_project)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
sorted(roles),
|
||||
sorted(['_member_', 'project_admin',
|
||||
'project_mod', 'heat_stack_owner']))
|
||||
|
||||
action.submit({})
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
def test_new_project_action_rerun_post_approve(self):
|
||||
"""
|
||||
|
|
@ -825,37 +825,37 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEquals(new_project.parent_id, project.id)
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.parent_id, project.id)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
roles = fake_client._get_roles_as_names(user, new_project)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
sorted(roles),
|
||||
sorted(['_member_', 'project_admin',
|
||||
'project_mod', 'heat_stack_owner']))
|
||||
|
||||
action.post_approve()
|
||||
# Nothing should change
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEquals(new_project.parent_id, project.id)
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.parent_id, project.id)
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, new_project)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
sorted(roles),
|
||||
sorted(['_member_', 'project_admin',
|
||||
'project_mod', 'heat_stack_owner']))
|
||||
|
||||
action.submit({})
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
def test_new_project_action_wrong_parent_id(self):
|
||||
"""
|
||||
|
|
@ -886,13 +886,13 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
action.submit({})
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
def test_new_project_action_wrong_domain_id(self):
|
||||
"""
|
||||
|
|
@ -923,13 +923,13 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
action.submit({})
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
def test_new_project_action_no_parent_id(self):
|
||||
"""
|
||||
|
|
@ -959,14 +959,14 @@ class ProjectActionTests(TestCase):
|
|||
action = NewProjectAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEquals(new_project.parent_id, None)
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.parent_id, None)
|
||||
|
||||
action.submit({})
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
|
|
|||
|
|
@ -73,12 +73,12 @@ class ProjectSetupActionTests(TestCase):
|
|||
data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
action.action.cache,
|
||||
{'network_id': 'net_id_0',
|
||||
'port_id': 'port_id_3',
|
||||
|
|
@ -87,11 +87,11 @@ class ProjectSetupActionTests(TestCase):
|
|||
)
|
||||
|
||||
global neutron_cache
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['networks']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['routers']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['subnets']), 1)
|
||||
|
||||
def test_network_setup_no_setup(self):
|
||||
|
|
@ -123,19 +123,19 @@ class ProjectSetupActionTests(TestCase):
|
|||
data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(action.action.cache, {})
|
||||
self.assertEqual(action.action.cache, {})
|
||||
|
||||
global neutron_cache
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['networks']), 0)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['routers']), 0)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['subnets']), 0)
|
||||
|
||||
def test_network_setup_fail(self):
|
||||
|
|
@ -168,7 +168,7 @@ class ProjectSetupActionTests(TestCase):
|
|||
data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
neutron_cache['RegionOne']['test_project_id']['routers'] = []
|
||||
|
||||
|
|
@ -178,24 +178,24 @@ class ProjectSetupActionTests(TestCase):
|
|||
except Exception:
|
||||
pass
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
action.action.cache,
|
||||
{'network_id': 'net_id_0',
|
||||
'subnet_id': 'subnet_id_1'}
|
||||
)
|
||||
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['networks']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['subnets']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['routers']), 0)
|
||||
|
||||
neutron_cache['RegionOne']['test_project_id']['routers'] = {}
|
||||
|
||||
action.post_approve()
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
action.action.cache,
|
||||
{'network_id': 'net_id_0',
|
||||
'port_id': 'port_id_3',
|
||||
|
|
@ -203,11 +203,11 @@ class ProjectSetupActionTests(TestCase):
|
|||
'subnet_id': 'subnet_id_1'}
|
||||
)
|
||||
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['networks']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['routers']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['subnets']), 1)
|
||||
|
||||
@modify_dict_settings(DEFAULT_ACTION_SETTINGS={
|
||||
|
|
@ -238,7 +238,7 @@ class ProjectSetupActionTests(TestCase):
|
|||
data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
# Now we add the project data as this is where the project
|
||||
# would be created:
|
||||
|
|
@ -253,9 +253,9 @@ class ProjectSetupActionTests(TestCase):
|
|||
task.cache = {'project_id': "test_project_id"}
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
action.action.cache,
|
||||
{'network_id': 'net_id_0',
|
||||
'port_id': 'port_id_3',
|
||||
|
|
@ -264,11 +264,11 @@ class ProjectSetupActionTests(TestCase):
|
|||
)
|
||||
|
||||
global neutron_cache
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['networks']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['routers']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['subnets']), 1)
|
||||
|
||||
def test_new_project_network_setup_no_id(self):
|
||||
|
|
@ -288,19 +288,19 @@ class ProjectSetupActionTests(TestCase):
|
|||
data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
self.assertEquals(action.action.cache, {})
|
||||
self.assertEqual(action.action.cache, {})
|
||||
|
||||
global neutron_cache
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['networks']), 0)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['routers']), 0)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['subnets']), 0)
|
||||
|
||||
def test_new_project_network_setup_no_setup(self):
|
||||
|
|
@ -320,7 +320,7 @@ class ProjectSetupActionTests(TestCase):
|
|||
data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
# Now we add the project data as this is where the project
|
||||
# would be created:
|
||||
|
|
@ -335,16 +335,16 @@ class ProjectSetupActionTests(TestCase):
|
|||
task.cache = {'project_id': "test_project_id"}
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(action.action.cache, {})
|
||||
self.assertEqual(action.action.cache, {})
|
||||
|
||||
global neutron_cache
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['networks']), 0)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['routers']), 0)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['subnets']), 0)
|
||||
|
||||
def test_new_project_network_setup_fail(self):
|
||||
|
|
@ -365,7 +365,7 @@ class ProjectSetupActionTests(TestCase):
|
|||
data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
neutron_cache['RegionOne']['test_project_id']['routers'] = []
|
||||
|
||||
|
|
@ -387,24 +387,24 @@ class ProjectSetupActionTests(TestCase):
|
|||
except Exception:
|
||||
pass
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
action.action.cache,
|
||||
{'network_id': 'net_id_0',
|
||||
'subnet_id': 'subnet_id_1'}
|
||||
)
|
||||
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['networks']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['subnets']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['routers']), 0)
|
||||
|
||||
neutron_cache['RegionOne']['test_project_id']['routers'] = {}
|
||||
|
||||
action.post_approve()
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
action.action.cache,
|
||||
{'network_id': 'net_id_0',
|
||||
'port_id': 'port_id_3',
|
||||
|
|
@ -412,11 +412,11 @@ class ProjectSetupActionTests(TestCase):
|
|||
'subnet_id': 'subnet_id_1'}
|
||||
)
|
||||
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['networks']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['routers']), 1)
|
||||
self.assertEquals(len(
|
||||
self.assertEqual(len(
|
||||
neutron_cache['RegionOne']['test_project_id']['subnets']), 1)
|
||||
|
||||
def test_set_quota(self):
|
||||
|
|
@ -440,27 +440,27 @@ class ProjectSetupActionTests(TestCase):
|
|||
action = SetProjectQuotaAction({}, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
# check the quotas were updated
|
||||
# This relies on test_settings heavily.
|
||||
cinderquota = cinder_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(cinderquota['gigabytes'], 5000)
|
||||
self.assertEqual(cinderquota['gigabytes'], 5000)
|
||||
novaquota = nova_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(novaquota['ram'], 65536)
|
||||
self.assertEqual(novaquota['ram'], 65536)
|
||||
neutronquota = neutron_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(neutronquota['network'], 3)
|
||||
self.assertEqual(neutronquota['network'], 3)
|
||||
|
||||
# RegionThree, cinder only
|
||||
self.assertFalse('RegionThree' in nova_cache)
|
||||
r2_cinderquota = cinder_cache['RegionThree'][
|
||||
'test_project_id']['quota']
|
||||
self.assertEquals(r2_cinderquota['gigabytes'], 50000)
|
||||
self.assertEquals(r2_cinderquota['snapshots'], 600)
|
||||
self.assertEquals(r2_cinderquota['volumes'], 200)
|
||||
self.assertEqual(r2_cinderquota['gigabytes'], 50000)
|
||||
self.assertEqual(r2_cinderquota['snapshots'], 600)
|
||||
self.assertEqual(r2_cinderquota['volumes'], 200)
|
||||
|
||||
|
||||
@mock.patch(
|
||||
|
|
@ -523,19 +523,19 @@ class QuotaActionTests(TestCase):
|
|||
action = UpdateProjectQuotasAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
# check the quotas were updated
|
||||
# This relies on test_settings heavily.
|
||||
cinderquota = cinder_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(cinderquota['gigabytes'], 10000)
|
||||
self.assertEqual(cinderquota['gigabytes'], 10000)
|
||||
novaquota = nova_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(novaquota['ram'], 327680)
|
||||
self.assertEqual(novaquota['ram'], 327680)
|
||||
neutronquota = neutron_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(neutronquota['network'], 5)
|
||||
self.assertEqual(neutronquota['network'], 5)
|
||||
|
||||
def test_update_quota_multi_region(self):
|
||||
"""
|
||||
|
|
@ -572,26 +572,26 @@ class QuotaActionTests(TestCase):
|
|||
action = UpdateProjectQuotasAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
# check the quotas were updated
|
||||
# This relies on test_settings heavily.
|
||||
cinderquota = cinder_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(cinderquota['gigabytes'], 50000)
|
||||
self.assertEqual(cinderquota['gigabytes'], 50000)
|
||||
novaquota = nova_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(novaquota['ram'], 655360)
|
||||
self.assertEqual(novaquota['ram'], 655360)
|
||||
neutronquota = neutron_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(neutronquota['network'], 10)
|
||||
self.assertEqual(neutronquota['network'], 10)
|
||||
|
||||
cinderquota = cinder_cache['RegionTwo']['test_project_id']['quota']
|
||||
self.assertEquals(cinderquota['gigabytes'], 50000)
|
||||
self.assertEqual(cinderquota['gigabytes'], 50000)
|
||||
novaquota = nova_cache['RegionTwo']['test_project_id']['quota']
|
||||
self.assertEquals(novaquota['ram'], 655360)
|
||||
self.assertEqual(novaquota['ram'], 655360)
|
||||
neutronquota = neutron_cache['RegionTwo']['test_project_id']['quota']
|
||||
self.assertEquals(neutronquota['network'], 10)
|
||||
self.assertEqual(neutronquota['network'], 10)
|
||||
|
||||
@override_settings(QUOTA_SIZES_ASC=[])
|
||||
def test_update_quota_not_in_sizes_asc(self):
|
||||
|
|
@ -630,23 +630,23 @@ class QuotaActionTests(TestCase):
|
|||
action = UpdateProjectQuotasAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
# check the quotas were updated
|
||||
# This relies on test_settings heavily.
|
||||
cinderquota = cinder_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(cinderquota['gigabytes'], 50000)
|
||||
self.assertEqual(cinderquota['gigabytes'], 50000)
|
||||
novaquota = nova_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(novaquota['ram'], 655360)
|
||||
self.assertEqual(novaquota['ram'], 655360)
|
||||
neutronquota = neutron_cache['RegionOne']['test_project_id']['quota']
|
||||
self.assertEquals(neutronquota['network'], 10)
|
||||
self.assertEqual(neutronquota['network'], 10)
|
||||
|
||||
cinderquota = cinder_cache['RegionTwo']['test_project_id']['quota']
|
||||
self.assertEquals(cinderquota['gigabytes'], 50000)
|
||||
self.assertEqual(cinderquota['gigabytes'], 50000)
|
||||
novaquota = nova_cache['RegionTwo']['test_project_id']['quota']
|
||||
self.assertEquals(novaquota['ram'], 655360)
|
||||
self.assertEqual(novaquota['ram'], 655360)
|
||||
neutronquota = neutron_cache['RegionTwo']['test_project_id']['quota']
|
||||
self.assertEquals(neutronquota['network'], 10)
|
||||
self.assertEqual(neutronquota['network'], 10)
|
||||
|
|
|
|||
|
|
@ -57,26 +57,26 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = NewUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEquals(
|
||||
self.assertEqual(action.valid, True)
|
||||
self.assertEqual(
|
||||
len(fake_clients.identity_cache['new_users']), 1)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
user = fake_client.find_user(name="test@example.com", domain="default")
|
||||
|
||||
self.assertEquals(user.email, 'test@example.com')
|
||||
self.assertEquals(user.password, '123456')
|
||||
self.assertEqual(user.email, 'test@example.com')
|
||||
self.assertEqual(user.password, '123456')
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['_member_'])
|
||||
self.assertEqual(roles, ['_member_'])
|
||||
|
||||
def test_new_user_existing(self):
|
||||
"""
|
||||
|
|
@ -108,19 +108,19 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = NewUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['_member_'])
|
||||
self.assertEqual(roles, ['_member_'])
|
||||
|
||||
def test_new_user_disabled(self):
|
||||
"""
|
||||
|
|
@ -154,26 +154,26 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = NewUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEquals(len(fake_clients.identity_cache['users']), 2)
|
||||
self.assertEqual(action.valid, True)
|
||||
self.assertEqual(len(fake_clients.identity_cache['users']), 2)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
user = fake_client.find_user(name="test@example.com", domain="default")
|
||||
|
||||
self.assertEquals(user.email, 'test@example.com')
|
||||
self.assertEquals(user.password, '123456')
|
||||
self.assertEqual(user.email, 'test@example.com')
|
||||
self.assertEqual(user.password, '123456')
|
||||
self.assertTrue(user.enabled)
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['_member_'])
|
||||
self.assertEqual(roles, ['_member_'])
|
||||
|
||||
def test_new_user_existing_role(self):
|
||||
"""
|
||||
|
|
@ -216,20 +216,20 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = NewUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEquals(action.action.state, 'complete')
|
||||
self.assertEqual(action.valid, True)
|
||||
self.assertEqual(action.action.state, 'complete')
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['_member_'])
|
||||
self.assertEqual(roles, ['_member_'])
|
||||
|
||||
def test_new_user_no_tenant(self):
|
||||
"""
|
||||
|
|
@ -257,14 +257,14 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = NewUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
def test_new_user_wrong_project(self):
|
||||
"""
|
||||
|
|
@ -299,7 +299,7 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = NewUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
def test_new_user_only_member(self):
|
||||
"""
|
||||
|
|
@ -405,16 +405,16 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = ResetUserPasswordAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
fake_clients.identity_cache['users'][user.id].password,
|
||||
'123456')
|
||||
|
||||
|
|
@ -447,16 +447,16 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = ResetUserPasswordAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
fake_clients.identity_cache['users'][user.id].password,
|
||||
'123456')
|
||||
|
||||
|
|
@ -483,14 +483,14 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = ResetUserPasswordAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
def test_edit_user_roles_add(self):
|
||||
"""
|
||||
|
|
@ -524,19 +524,19 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = EditUserRolesAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(sorted(roles), sorted(['_member_', 'project_mod']))
|
||||
self.assertEqual(sorted(roles), sorted(['_member_', 'project_mod']))
|
||||
|
||||
def test_edit_user_roles_add_complete(self):
|
||||
"""
|
||||
|
|
@ -583,20 +583,20 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = EditUserRolesAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEquals(action.action.state, "complete")
|
||||
self.assertEqual(action.valid, True)
|
||||
self.assertEqual(action.action.state, "complete")
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['_member_', 'project_mod'])
|
||||
self.assertEqual(roles, ['_member_', 'project_mod'])
|
||||
|
||||
def test_edit_user_roles_remove(self):
|
||||
"""
|
||||
|
|
@ -644,19 +644,19 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = EditUserRolesAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['_member_'])
|
||||
self.assertEqual(roles, ['_member_'])
|
||||
|
||||
def test_edit_user_roles_remove_complete(self):
|
||||
"""
|
||||
|
|
@ -697,20 +697,20 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = EditUserRolesAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEquals(action.action.state, "complete")
|
||||
self.assertEqual(action.valid, True)
|
||||
self.assertEqual(action.action.state, "complete")
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['_member_'])
|
||||
self.assertEqual(roles, ['_member_'])
|
||||
|
||||
def test_edit_user_roles_can_manage_all(self):
|
||||
"""
|
||||
|
|
@ -758,12 +758,12 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = EditUserRolesAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['_member_', 'project_admin'])
|
||||
self.assertEqual(roles, ['_member_', 'project_admin'])
|
||||
|
||||
def test_edit_user_roles_modified_settings(self):
|
||||
"""
|
||||
|
|
@ -804,7 +804,7 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = EditUserRolesAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
# Change settings
|
||||
with self.modify_dict_settings(ROLES_MAPPING={
|
||||
|
|
@ -812,24 +812,24 @@ class UserActionTests(AdjutantTestCase):
|
|||
'operation': "remove",
|
||||
'value': 'heat_stack_owner'}):
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
# After Settings Reset
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['project_mod', 'heat_stack_owner'])
|
||||
self.assertEqual(roles, ['project_mod', 'heat_stack_owner'])
|
||||
|
||||
@modify_dict_settings(ROLES_MAPPING={'key_list': ['project_mod'],
|
||||
'operation': "append", 'value': 'new_role'})
|
||||
|
|
@ -876,19 +876,19 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = EditUserRolesAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['project_mod', 'new_role'])
|
||||
self.assertEqual(roles, ['project_mod', 'new_role'])
|
||||
|
||||
# Simple positive tests for when USERNAME_IS_EMAIL=False
|
||||
@override_settings(USERNAME_IS_EMAIL=False)
|
||||
|
|
@ -922,26 +922,26 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = NewUserAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEquals(len(fake_clients.identity_cache['users']), 2)
|
||||
self.assertEqual(action.valid, True)
|
||||
self.assertEqual(len(fake_clients.identity_cache['users']), 2)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
user = fake_client.find_user(name="test_user", domain="default")
|
||||
|
||||
self.assertEquals(user.email, 'test@example.com')
|
||||
self.assertEquals(user.password, '123456')
|
||||
self.assertEqual(user.email, 'test@example.com')
|
||||
self.assertEqual(user.password, '123456')
|
||||
self.assertTrue(user.enabled)
|
||||
|
||||
roles = fake_client._get_roles_as_names(user, project)
|
||||
self.assertEquals(roles, ['_member_'])
|
||||
self.assertEqual(roles, ['_member_'])
|
||||
|
||||
@override_settings(USERNAME_IS_EMAIL=False)
|
||||
def test_reset_user_email_not_username(self):
|
||||
|
|
@ -972,21 +972,21 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = ResetUserPasswordAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
fake_client = fake_clients.FakeManager()
|
||||
|
||||
user = fake_client.find_user(name="test_user", domain="default")
|
||||
|
||||
self.assertEquals(user.email, 'test@example.com')
|
||||
self.assertEquals(user.password, '123456')
|
||||
self.assertEqual(user.email, 'test@example.com')
|
||||
self.assertEqual(user.password, '123456')
|
||||
|
||||
@override_settings(USERNAME_IS_EMAIL=False)
|
||||
def test_reset_user_password_case_insensitive_not_username(self):
|
||||
|
|
@ -1018,16 +1018,16 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = ResetUserPasswordAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {'password': '123456'}
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
fake_clients.identity_cache['users'][user.id].password,
|
||||
'123456')
|
||||
|
||||
|
|
@ -1058,21 +1058,21 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = UpdateUserEmailAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
token_data = {'confirm': True}
|
||||
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
fake_clients.identity_cache['users'][user.id].email,
|
||||
'new_test@example.com')
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
fake_clients.identity_cache['users'][user.id].name,
|
||||
'new_test@example.com')
|
||||
|
||||
|
|
@ -1099,15 +1099,15 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = UpdateUserEmailAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
token_data = {'confirm': True}
|
||||
|
||||
action.submit(token_data)
|
||||
self.assertEquals(action.valid, False)
|
||||
self.assertEqual(action.valid, False)
|
||||
|
||||
@override_settings(USERNAME_IS_EMAIL=False)
|
||||
def test_update_email_username_not_email(self):
|
||||
|
|
@ -1136,18 +1136,18 @@ class UserActionTests(AdjutantTestCase):
|
|||
action = UpdateUserEmailAction(data, task=task, order=1)
|
||||
|
||||
action.pre_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.post_approve()
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
action.submit({'confirm': True})
|
||||
self.assertEquals(action.valid, True)
|
||||
self.assertEqual(action.valid, True)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
fake_clients.identity_cache['users'][user.id].email,
|
||||
'new_testexample.com')
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
fake_clients.identity_cache['users'][user.id].name,
|
||||
'test_user')
|
||||
|
|
|
|||
|
|
@ -803,7 +803,7 @@ class AdminAPITests(APITestCase):
|
|||
{'notes': ['Token reissued.']})
|
||||
self.assertEqual(Token.objects.count(), 1)
|
||||
new_token = Token.objects.all()[0]
|
||||
self.assertNotEquals(new_token.token, uuid)
|
||||
self.assertNotEqual(new_token.token, uuid)
|
||||
|
||||
def test_token_reissue_non_admin(self):
|
||||
"""
|
||||
|
|
@ -843,7 +843,7 @@ class AdminAPITests(APITestCase):
|
|||
{'notes': ['Token reissued.']})
|
||||
self.assertEqual(Token.objects.count(), 1)
|
||||
new_token = Token.objects.all()[0]
|
||||
self.assertNotEquals(new_token.token, uuid)
|
||||
self.assertNotEqual(new_token.token, uuid)
|
||||
|
||||
# Now confirm it is limited by project id properly.
|
||||
headers['project_id'] = "test_project_id2"
|
||||
|
|
|
|||
|
|
@ -453,15 +453,15 @@ class QuotaAPITests(APITestCase):
|
|||
"""
|
||||
cinderquota = cinder_cache[region_name][project_id]['quota']
|
||||
gigabytes = settings.PROJECT_QUOTA_SIZES[size]['cinder']['gigabytes']
|
||||
self.assertEquals(cinderquota['gigabytes'], gigabytes)
|
||||
self.assertEqual(cinderquota['gigabytes'], gigabytes)
|
||||
|
||||
novaquota = nova_cache[region_name][project_id]['quota']
|
||||
ram = settings.PROJECT_QUOTA_SIZES[size]['nova']['ram']
|
||||
self.assertEquals(novaquota['ram'], ram)
|
||||
self.assertEqual(novaquota['ram'], ram)
|
||||
|
||||
neutronquota = neutron_cache[region_name][project_id]['quota']
|
||||
network = settings.PROJECT_QUOTA_SIZES[size]['neutron']['network']
|
||||
self.assertEquals(neutronquota['network'], network)
|
||||
self.assertEqual(neutronquota['network'], network)
|
||||
|
||||
def test_update_quota_no_history(self):
|
||||
""" Update the quota size of a project with no history """
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ class TaskViewTests(AdjutantAPITestCase):
|
|||
response = self.client.post(url, data, format='json')
|
||||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
||||
self.assertEqual(len(mail.outbox), 2)
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
fake_clients.identity_cache['new_users'][0].name,
|
||||
'test@example.com')
|
||||
|
||||
|
|
@ -269,7 +269,7 @@ class TaskViewTests(AdjutantAPITestCase):
|
|||
)
|
||||
|
||||
new_project = fake_clients.identity_cache['new_projects'][0]
|
||||
self.assertEquals(new_project.name, 'test_project')
|
||||
self.assertEqual(new_project.name, 'test_project')
|
||||
|
||||
new_token = Token.objects.all()[0]
|
||||
url = "/v1/tokens/" + new_token.token
|
||||
|
|
@ -693,7 +693,7 @@ class TaskViewTests(AdjutantAPITestCase):
|
|||
data = {'confirm': True}
|
||||
response = self.client.post(url, data, format='json')
|
||||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
||||
self.assertEquals(user.name, 'new_test@example.com')
|
||||
self.assertEqual(user.name, 'new_test@example.com')
|
||||
|
||||
@modify_dict_settings(TASK_SETTINGS=[
|
||||
{'key_list': ['update_email', 'additional_actions'],
|
||||
|
|
@ -906,7 +906,7 @@ class TaskViewTests(AdjutantAPITestCase):
|
|||
data = {'confirm': True}
|
||||
response = self.client.post(url, data, format='json')
|
||||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
||||
self.assertEquals(user.email, 'new_test@example.com')
|
||||
self.assertEqual(user.email, 'new_test@example.com')
|
||||
|
||||
def test_update_email_task_not_authenticated(self):
|
||||
"""
|
||||
|
|
@ -957,8 +957,8 @@ class TaskViewTests(AdjutantAPITestCase):
|
|||
data = {'confirm': True}
|
||||
response = self.client.post(url, data, format='json')
|
||||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
||||
self.assertEquals(user.name, "test_user")
|
||||
self.assertEquals(user.email, 'new_test@example.com')
|
||||
self.assertEqual(user.name, "test_user")
|
||||
self.assertEqual(user.email, 'new_test@example.com')
|
||||
|
||||
# Tests for USERNAME_IS_EMAIL=False
|
||||
@override_settings(USERNAME_IS_EMAIL=False)
|
||||
|
|
@ -986,8 +986,8 @@ class TaskViewTests(AdjutantAPITestCase):
|
|||
self.assertEqual(response.json(), {'notes': ['created token']})
|
||||
|
||||
self.assertEqual(len(mail.outbox), 1)
|
||||
self.assertEquals(mail.outbox[0].subject, 'invite_user')
|
||||
self.assertEquals(mail.outbox[0].to[0], 'new@example.com')
|
||||
self.assertEqual(mail.outbox[0].subject, 'invite_user')
|
||||
self.assertEqual(mail.outbox[0].to[0], 'new@example.com')
|
||||
|
||||
new_token = Token.objects.all()[0]
|
||||
url = "/v1/tokens/" + new_token.token
|
||||
|
|
@ -996,7 +996,7 @@ class TaskViewTests(AdjutantAPITestCase):
|
|||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
||||
self.assertEqual(len(mail.outbox), 2)
|
||||
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
fake_clients.identity_cache['new_users'][0].name,
|
||||
'new_user')
|
||||
|
||||
|
|
|
|||
|
|
@ -242,8 +242,8 @@ class ModifySettingsTests(AdjutantAPITestCase):
|
|||
|
||||
response = self.client.post(url, data, headers=headers, format='json')
|
||||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
||||
self.assertEquals(len(mail.outbox), 1)
|
||||
self.assertNotEquals(mail.outbox[0].subject, 'modified_token_email')
|
||||
self.assertEqual(len(mail.outbox), 1)
|
||||
self.assertNotEqual(mail.outbox[0].subject, 'modified_token_email')
|
||||
|
||||
with self.modify_dict_settings(TASK_SETTINGS=override):
|
||||
data = {'new_email': "test2@example.com"}
|
||||
|
|
@ -251,13 +251,13 @@ class ModifySettingsTests(AdjutantAPITestCase):
|
|||
response = self.client.post(url, data,
|
||||
headers=headers, format='json')
|
||||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
||||
self.assertEquals(len(mail.outbox), 2)
|
||||
self.assertEquals(mail.outbox[1].subject, 'modified_token_email')
|
||||
self.assertEqual(len(mail.outbox), 2)
|
||||
self.assertEqual(mail.outbox[1].subject, 'modified_token_email')
|
||||
|
||||
data = {'new_email': "test3@example.com"}
|
||||
|
||||
response = self.client.post(url, data, headers=headers, format='json')
|
||||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
||||
|
||||
self.assertEquals(len(mail.outbox), 3)
|
||||
self.assertNotEquals(mail.outbox[2].subject, 'modified_token_email')
|
||||
self.assertEqual(len(mail.outbox), 3)
|
||||
self.assertNotEqual(mail.outbox[2].subject, 'modified_token_email')
|
||||
|
|
|
|||
Loading…
Reference in New Issue