diff --git a/storyboard/tests/api/auth/test_oauth.py b/storyboard/tests/api/auth/test_oauth.py index 4a764f99..e040b28d 100644 --- a/storyboard/tests/api/auth/test_oauth.py +++ b/storyboard/tests/api/auth/test_oauth.py @@ -551,8 +551,8 @@ class TestOAuthAccessToken(BaseOAuthTest): self.assertIsNotNone(access_token) # Assert that system configured values is owned by the correct user. - self.assertEquals(2, access_token.user_id) - self.assertEquals(token['id_token'], access_token.user_id) + self.assertEqual(2, access_token.user_id) + self.assertEqual(token['id_token'], access_token.user_id) self.assertEqual(token['expires_in'], CONF.oauth.access_token_ttl) self.assertEqual(token['expires_in'], access_token.expires_in) self.assertEqual(token['access_token'], access_token.access_token) @@ -566,7 +566,7 @@ class TestOAuthAccessToken(BaseOAuthTest): self.assertIsNotNone(refresh_token) # Assert that system configured values is owned by the correct user. - self.assertEquals(2, refresh_token.user_id) + self.assertEqual(2, refresh_token.user_id) self.assertEqual(CONF.oauth.refresh_token_ttl, refresh_token.expires_in) self.assertEqual(token['refresh_token'], refresh_token.refresh_token) @@ -791,8 +791,8 @@ class TestOAuthAccessToken(BaseOAuthTest): self.assertIsNotNone(new_access_token) # Assert that system configured values is owned by the correct user. - self.assertEquals(2, new_access_token.user_id) - self.assertEquals(t2['id_token'], new_access_token.user_id) + self.assertEqual(2, new_access_token.user_id) + self.assertEqual(t2['id_token'], new_access_token.user_id) self.assertEqual(t2['expires_in'], CONF.oauth.access_token_ttl) self.assertEqual(t2['expires_in'], new_access_token.expires_in) self.assertEqual(t2['access_token'], @@ -807,7 +807,7 @@ class TestOAuthAccessToken(BaseOAuthTest): self.assertIsNotNone(new_refresh_token) # Assert that system configured values is owned by the correct user. - self.assertEquals(2, new_refresh_token.user_id) + self.assertEqual(2, new_refresh_token.user_id) self.assertEqual(CONF.oauth.refresh_token_ttl, new_refresh_token.expires_in) self.assertEqual(t2['refresh_token'], diff --git a/storyboard/tests/api/test_subscriptions.py b/storyboard/tests/api/test_subscriptions.py index 810eec4a..7312d819 100644 --- a/storyboard/tests/api/test_subscriptions.py +++ b/storyboard/tests/api/test_subscriptions.py @@ -46,9 +46,9 @@ class TestSubscriptionsAsUser(base.FunctionalTest): }) subscription = response.json - self.assertEquals('project', subscription['target_type']) - self.assertEquals(1, subscription['target_id']) - self.assertEquals(2, subscription['user_id']) + self.assertEqual('project', subscription['target_type']) + self.assertEqual(1, subscription['target_id']) + self.assertEqual(2, subscription['user_id']) self.assertIsNotNone(subscription['id']) response2 = self.post_json(self.resource, { @@ -58,9 +58,9 @@ class TestSubscriptionsAsUser(base.FunctionalTest): }) subscription2 = response2.json - self.assertEquals('project', subscription2['target_type']) - self.assertEquals(2, subscription2['target_id']) - self.assertEquals(2, subscription2['user_id']) + self.assertEqual('project', subscription2['target_type']) + self.assertEqual(2, subscription2['target_id']) + self.assertEqual(2, subscription2['user_id']) self.assertIsNotNone(subscription2['id']) def test_delete_subscriptions(self): @@ -104,7 +104,7 @@ class TestSubscriptionsAsUser(base.FunctionalTest): }) response = self.get_json(self.resource) - self.assertEquals(1, len(response)) + self.assertEqual(1, len(response)) response = self.get_json(self.resource + '?target_type=project') @@ -126,25 +126,25 @@ class TestSubscriptionsAsUser(base.FunctionalTest): 'target_id': 100, 'target_type': 'project' }, expect_errors=True) - self.assertEquals(400, response.status_code) + self.assertEqual(400, response.status_code) response = self.post_json(self.resource, { 'target_id': 100, 'target_type': 'story' }, expect_errors=True) - self.assertEquals(400, response.status_code) + self.assertEqual(400, response.status_code) response = self.post_json(self.resource, { 'target_id': 100, 'target_type': 'task' }, expect_errors=True) - self.assertEquals(400, response.status_code) + self.assertEqual(400, response.status_code) response = self.post_json(self.resource, { 'target_id': 100, 'target_type': 'notarealresource' }, expect_errors=True) - self.assertEquals(400, response.status_code) + self.assertEqual(400, response.status_code) def test_cannot_create_duplicates(self): """Assert that we cannot create duplicate subscriptions.""" @@ -152,7 +152,7 @@ class TestSubscriptionsAsUser(base.FunctionalTest): 'target_id': 1, 'target_type': 'project' }) - self.assertEquals(200, response1.status_code) + self.assertEqual(200, response1.status_code) response2 = self.post_json(self.resource, { 'target_id': 1, 'target_type': 'project' @@ -187,17 +187,17 @@ class TestSubscriptionsAsSuperuser(base.FunctionalTest): }) subscription = response.json - self.assertEquals('project', subscription['target_type']) - self.assertEquals(1, subscription['target_id']) - self.assertEquals(3, subscription['user_id']) + self.assertEqual('project', subscription['target_type']) + self.assertEqual(1, subscription['target_id']) + self.assertEqual(3, subscription['user_id']) self.assertIsNotNone(subscription['id']) def test_get_subscription(self): """Assert that we can read subscriptions for others. """ response = self.get_json(self.resource + '/3') - self.assertEquals(3, response['id']) - self.assertEquals(3, response['user_id']) + self.assertEqual(3, response['id']) + self.assertEqual(3, response['user_id']) def test_can_search_for_not_self(self): """Assert that we can search other people's subscriptions.""" diff --git a/storyboard/tests/api/test_user_tokens.py b/storyboard/tests/api/test_user_tokens.py index 7ed752b0..779e9f40 100644 --- a/storyboard/tests/api/test_user_tokens.py +++ b/storyboard/tests/api/test_user_tokens.py @@ -104,7 +104,7 @@ class TestUserTokensAsUser(base.FunctionalTest): } response = self.post_json(self.resource, token, expect_errors=True) - self.assertEquals(409, response.status_code) + self.assertEqual(409, response.status_code) def test_update_expiration_date(self): """Assert that a user may ONLY update the expiration time on their @@ -155,12 +155,12 @@ class TestUserTokensAsUser(base.FunctionalTest): } response = self.post_json('/users/3/tokens', token, expect_errors=True) - self.assertEquals(403, response.status_code) + self.assertEqual(403, response.status_code) def test_get_unauthorized(self): """Assert that a user cannot retrieve a token for someone else.""" response = self.get_json('/users/1/tokens/1', expect_errors=True) - self.assertEquals(403, response.status_code) + self.assertEqual(403, response.status_code) def test_update_unauthorized(self): """Assert that a user cannot update a token for someone else.""" @@ -171,13 +171,13 @@ class TestUserTokensAsUser(base.FunctionalTest): response = self.put_json('/users/1/tokens/1', token, expect_errors=True) - self.assertEquals(403, response.status_code) + self.assertEqual(403, response.status_code) def test_delete_unauthorized(self): """Assert that a user cannot delete a token for someone else.""" response = self.delete('/users/1/tokens/1', expect_errors=True) - self.assertEquals(403, response.status_code) + self.assertEqual(403, response.status_code) def test_funny_business(self): """Assert that a user cannot create a token for someone else by @@ -190,7 +190,7 @@ class TestUserTokensAsUser(base.FunctionalTest): } response = self.post_json(self.resource, token, expect_errors=True) - self.assertEquals(403, response.status_code) + self.assertEqual(403, response.status_code) class TestUserTokensAsNoUser(base.FunctionalTest): @@ -212,12 +212,12 @@ class TestUserTokensAsNoUser(base.FunctionalTest): } response = self.post_json('/users/3/tokens', token, expect_errors=True) - self.assertEquals(401, response.status_code) + self.assertEqual(401, response.status_code) def test_get_unauthorized(self): """Assert that a user cannot retrieve a token for someone else.""" response = self.get_json('/users/1/tokens/1', expect_errors=True) - self.assertEquals(401, response.status_code) + self.assertEqual(401, response.status_code) def test_update_unauthorized(self): """Assert that a user cannot update a token for someone else.""" @@ -228,13 +228,13 @@ class TestUserTokensAsNoUser(base.FunctionalTest): response = self.put_json('/users/1/tokens/1', token, expect_errors=True) - self.assertEquals(401, response.status_code) + self.assertEqual(401, response.status_code) def test_delete_unauthorized(self): """Assert that a user cannot delete a token for someone else.""" response = self.delete('/users/1/tokens/1', expect_errors=True) - self.assertEquals(401, response.status_code) + self.assertEqual(401, response.status_code) class TestUserTokensAsSuperuser(base.FunctionalTest): @@ -291,4 +291,4 @@ class TestUserTokensAsSuperuser(base.FunctionalTest): self.assertEqual(204, response.status_code) response = self.get_json('/users/2/tokens/3', expect_errors=True) - self.assertEquals(404, response.status_code) + self.assertEqual(404, response.status_code) diff --git a/storyboard/tests/notifications/test_notification_hook.py b/storyboard/tests/notifications/test_notification_hook.py index 4f5e7064..29314b62 100644 --- a/storyboard/tests/notifications/test_notification_hook.py +++ b/storyboard/tests/notifications/test_notification_hook.py @@ -159,22 +159,22 @@ class TestNotificationHook(base.BaseDbTestCase): sample_task_wmodel = TaskWmodel.from_db_model(sample_task) old_entity_values = n.get_original_resource('task', 1) - self.assertEquals(old_entity_values['id'], - sample_task_wmodel.id) - self.assertEquals(old_entity_values['creator_id'], - sample_task_wmodel.creator_id) - self.assertEquals(old_entity_values['title'], - sample_task_wmodel.title) - self.assertEquals(old_entity_values['status'], - sample_task_wmodel.status) - self.assertEquals(old_entity_values['story_id'], - sample_task_wmodel.story_id) - self.assertEquals(old_entity_values['project_id'], - sample_task_wmodel.project_id) - self.assertEquals(old_entity_values['assignee_id'], - sample_task_wmodel.assignee_id) - self.assertEquals(old_entity_values['priority'], - sample_task_wmodel.priority) + self.assertEqual(old_entity_values['id'], + sample_task_wmodel.id) + self.assertEqual(old_entity_values['creator_id'], + sample_task_wmodel.creator_id) + self.assertEqual(old_entity_values['title'], + sample_task_wmodel.title) + self.assertEqual(old_entity_values['status'], + sample_task_wmodel.status) + self.assertEqual(old_entity_values['story_id'], + sample_task_wmodel.story_id) + self.assertEqual(old_entity_values['project_id'], + sample_task_wmodel.project_id) + self.assertEqual(old_entity_values['assignee_id'], + sample_task_wmodel.assignee_id) + self.assertEqual(old_entity_values['priority'], + sample_task_wmodel.priority) @patch('storyboard.db.api.base.entity_get') def test_old_entity_values_set_on_state_by_before(self, mock_entity_get): @@ -204,22 +204,22 @@ class TestNotificationHook(base.BaseDbTestCase): sample_task_wmodel = TaskWmodel.from_db_model(sample_task) n.before(mock_state) - self.assertEquals(mock_state.old_entity_values['id'], - sample_task_wmodel.id) - self.assertEquals(mock_state.old_entity_values['creator_id'], - sample_task_wmodel.creator_id) - self.assertEquals(mock_state.old_entity_values['title'], - sample_task_wmodel.title) - self.assertEquals(mock_state.old_entity_values['status'], - sample_task_wmodel.status) - self.assertEquals(mock_state.old_entity_values['story_id'], - sample_task_wmodel.story_id) - self.assertEquals(mock_state.old_entity_values['project_id'], - sample_task_wmodel.project_id) - self.assertEquals(mock_state.old_entity_values['assignee_id'], - sample_task_wmodel.assignee_id) - self.assertEquals(mock_state.old_entity_values['priority'], - sample_task_wmodel.priority) + self.assertEqual(mock_state.old_entity_values['id'], + sample_task_wmodel.id) + self.assertEqual(mock_state.old_entity_values['creator_id'], + sample_task_wmodel.creator_id) + self.assertEqual(mock_state.old_entity_values['title'], + sample_task_wmodel.title) + self.assertEqual(mock_state.old_entity_values['status'], + sample_task_wmodel.status) + self.assertEqual(mock_state.old_entity_values['story_id'], + sample_task_wmodel.story_id) + self.assertEqual(mock_state.old_entity_values['project_id'], + sample_task_wmodel.project_id) + self.assertEqual(mock_state.old_entity_values['assignee_id'], + sample_task_wmodel.assignee_id) + self.assertEqual(mock_state.old_entity_values['priority'], + sample_task_wmodel.priority) @patch('storyboard.notifications.notification_hook.publish') @patch.object(NotificationHook, 'get_original_resource') diff --git a/storyboard/tests/plugin/scheduler/test_init.py b/storyboard/tests/plugin/scheduler/test_init.py index 651b6de0..49f49894 100644 --- a/storyboard/tests/plugin/scheduler/test_init.py +++ b/storyboard/tests/plugin/scheduler/test_init.py @@ -154,7 +154,7 @@ class TestSchedulerCoreMethods(base.DbTestCase): # make sure the plugin is only loaded once. self.assertTrue(test_list.index(mock_plugin_name) == 0) - self.assertEquals(len(test_list), 1) + self.assertEqual(len(test_list), 1) # Get the job. second_run_job = scheduler.SCHEDULER.get_job(mock_plugin_name)