diff --git a/barbican/tests/api/controllers/test_acls.py b/barbican/tests/api/controllers/test_acls.py index 7a81f0c30..23298aeae 100644 --- a/barbican/tests/api/controllers/test_acls.py +++ b/barbican/tests/api/controllers/test_acls.py @@ -112,20 +112,20 @@ class WhenTestingSecretACLsResource(utils.BarbicanAPIBaseTestCase, self.app, entity_type='secrets', op_type='create', entity_id=secret_uuid, roles=['creator'], user='NotSecretCreator', expect_errors=True) - self.assertEqual(resp.status_int, 403) + self.assertEqual(403, resp.status_int) resp = self._set_acls_with_context( self.app, entity_type='secrets', op_type='create', entity_id=secret_uuid, roles=['creator'], user=creator_user_id, expect_errors=False) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) # test for user with 'admin' role in secret project resp = self._set_acls_with_context( self.app, entity_type='secrets', op_type='create', entity_id=secret_uuid2, roles=['admin'], user='AdminUser', expect_errors=False) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) def test_create_new_secret_acls_with_project_access_false(self): """Should allow creating acls for a new secret with project-access.""" @@ -380,19 +380,19 @@ class WhenTestingSecretACLsResource(utils.BarbicanAPIBaseTestCase, self.app, entity_type='secrets', op_type='update', entity_id=secret_uuid, roles=['creator'], user='NotSecretCreator', expect_errors=True) - self.assertEqual(resp.status_int, 403) + self.assertEqual(403, resp.status_int) resp = self._set_acls_with_context( self.app, entity_type='secrets', op_type='update', entity_id=secret_uuid, roles=['creator'], user=creator_user_id) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) # test for user with 'admin' role in secret project resp = self._set_acls_with_context( self.app, entity_type='secrets', op_type='update', entity_id=secret_uuid, roles=['admin'], user='AdminUser') - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) def test_partial_update_secret_acls_modify_project_access_values(self): """Acls partial update where project-access flag is modified.""" @@ -462,14 +462,14 @@ class WhenTestingSecretACLsResource(utils.BarbicanAPIBaseTestCase, entity_id=secret_uuid, roles=['creator'], user='NotSecretCreator', expect_errors=True) - self.assertEqual(resp.status_int, 403) + self.assertEqual(403, resp.status_int) resp = self._set_acls_with_context( self.app, entity_type='secrets', op_type='delete', entity_id=secret_uuid, roles=['creator'], user=creator_user_id) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) # Create new secret ACLs again. self._set_acls_with_context( @@ -480,7 +480,7 @@ class WhenTestingSecretACLsResource(utils.BarbicanAPIBaseTestCase, self.app, entity_type='secrets', op_type='delete', entity_id=secret_uuid, roles=['admin'], user='AdminUser') - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) def test_invoke_secret_acls_head_should_fail(self): """Should fail as put request to secret acls URI is not supported.""" @@ -523,7 +523,7 @@ class WhenTestingSecretACLsResource(utils.BarbicanAPIBaseTestCase, '/secrets/?acl_only=TrUe') self.assertEqual(200, resp.status_int) secret_list = resp.json.get('secrets') - self.assertEqual(len(secret_list), 2) + self.assertEqual(2, len(secret_list)) self.assertNotIn(secret_uuid_no_acl, secret_list) @@ -568,20 +568,20 @@ class WhenTestingContainerAclsResource(utils.BarbicanAPIBaseTestCase, self.app, entity_type='containers', op_type='create', entity_id=container_id, roles=['creator'], user='NotContainerCreator', expect_errors=True) - self.assertEqual(resp.status_int, 403) + self.assertEqual(403, resp.status_int) resp = self._set_acls_with_context( self.app, entity_type='containers', op_type='create', entity_id=container_id, roles=['creator'], user=creator_user_id, expect_errors=False) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) # test for user with 'admin' role in container project resp = self._set_acls_with_context( self.app, entity_type='containers', op_type='create', entity_id=container_id2, roles=['admin'], user='AdminUser', expect_errors=False) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) def test_create_new_container_acls_with_project_access_true(self): """Should allow creating acls for new container with project-access.""" @@ -872,19 +872,19 @@ class WhenTestingContainerAclsResource(utils.BarbicanAPIBaseTestCase, self.app, entity_type='containers', op_type='update', entity_id=container_id, roles=['creator'], user='NotCreator', expect_errors=True) - self.assertEqual(resp.status_int, 403) + self.assertEqual(403, resp.status_int) resp = self._set_acls_with_context( self.app, entity_type='containers', op_type='update', entity_id=container_id, roles=['creator'], user=creator_user_id) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) # test for user with 'admin' role in container project resp = self._set_acls_with_context( self.app, entity_type='containers', op_type='update', entity_id=container_id, roles=['admin'], user='AdminUser') - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) def test_delete_container_acls_with_valid_container_id(self): """Delete existing acls for a given container.""" @@ -933,14 +933,14 @@ class WhenTestingContainerAclsResource(utils.BarbicanAPIBaseTestCase, entity_id=container_id, roles=['creator'], user='NotCreator', expect_errors=True) - self.assertEqual(resp.status_int, 403) + self.assertEqual(403, resp.status_int) resp = self._set_acls_with_context( self.app, entity_type='containers', op_type='delete', entity_id=container_id, roles=['creator'], user=creator_user_id) - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) # Create new container ACLs again. self._set_acls_with_context( @@ -951,7 +951,7 @@ class WhenTestingContainerAclsResource(utils.BarbicanAPIBaseTestCase, self.app, entity_type='containers', op_type='delete', entity_id=container_id, roles=['admin'], user='AdminUser') - self.assertEqual(resp.status_int, 200) + self.assertEqual(200, resp.status_int) def test_invoke_container_acls_head_should_fail(self): """PUT request to container acls URI is not supported.""" diff --git a/barbican/tests/api/controllers/test_cas.py b/barbican/tests/api/controllers/test_cas.py index 4a04992a4..8727943e4 100644 --- a/barbican/tests/api/controllers/test_cas.py +++ b/barbican/tests/api/controllers/test_cas.py @@ -45,21 +45,21 @@ class WhenTestingCAsResource(utils.BarbicanAPIBaseTestCase): self.create_cas(set_project_cas=False) resp = self.app.get('/cas/', self.params) - self.assertEqual(len(resp.namespace['cas']), self.limit) + self.assertEqual(self.limit, len(resp.namespace['cas'])) self.assertIn('previous', resp.namespace) self.assertIn('next', resp.namespace) url_nav_next = self._create_url(self.project_id, self.offset + self.limit, self.limit) - self.assertEqual(resp.body.decode('utf-8').count(url_nav_next), 1) + self.assertEqual(1, resp.body.decode('utf-8').count(url_nav_next)) url_nav_prev = self._create_url(self.project_id, 0, self.limit) - self.assertEqual(resp.body.decode('utf-8').count(url_nav_prev), 1) + self.assertEqual(1, resp.body.decode('utf-8').count(url_nav_prev)) url_hrefs = self._create_url(self.project_id) - self.assertEqual(resp.body.decode('utf-8').count(url_hrefs), - (self.limit + 2)) + self.assertEqual((self.limit + 2), + resp.body.decode('utf-8').count(url_hrefs)) def test_response_should_list_subca_and_project_cas(self): self.create_cas() @@ -149,7 +149,7 @@ class WhenTestingCAsResource(utils.BarbicanAPIBaseTestCase): self.assertNotIn('previous', resp.namespace) self.assertNotIn('next', resp.namespace) - self.assertEqual(resp.namespace['total'], 1) + self.assertEqual(1, resp.namespace['total']) def test_should_get_with_params_on_all_resource(self): self.create_cas(set_project_cas=False) @@ -161,13 +161,13 @@ class WhenTestingCAsResource(utils.BarbicanAPIBaseTestCase): self.assertNotIn('previous', resp.namespace) self.assertNotIn('next', resp.namespace) - self.assertEqual(resp.namespace['total'], 1) + self.assertEqual(1, resp.namespace['total']) def test_should_handle_no_cas(self): self.params = {'offset': 0, 'limit': 2, 'plugin_name': 'dummy'} resp = self.app.get('/cas/', self.params) - self.assertEqual(resp.namespace.get('cas'), []) - self.assertEqual(resp.namespace.get('total'), 0) + self.assertEqual([], resp.namespace.get('cas')) + self.assertEqual(0, resp.namespace.get('total')) self.assertNotIn('previous', resp.namespace) self.assertNotIn('next', resp.namespace) @@ -374,7 +374,7 @@ class WhenTestingCAsResource(utils.BarbicanAPIBaseTestCase): def test_should_get_no_projects(self): self.create_cas() resp = self.app.get('/cas/{0}/projects'.format(self.selected_ca_id)) - self.assertEqual(resp.namespace['projects'], []) + self.assertEqual([], resp.namespace['projects']) def test_should_raise_get_projects_ca_not_found(self): self.create_cas() diff --git a/barbican/tests/api/controllers/test_orders.py b/barbican/tests/api/controllers/test_orders.py index 3c7af7a2c..b27c8e09b 100644 --- a/barbican/tests/api/controllers/test_orders.py +++ b/barbican/tests/api/controllers/test_orders.py @@ -48,7 +48,7 @@ class WhenCreatingOrdersUsingOrdersResource(utils.BarbicanAPIBaseTestCase): order_type='key', meta=generic_key_meta ) - self.assertEqual(resp.status_int, 202) + self.assertEqual(202, resp.status_int) # Make sure we get a valid uuid for the order uuid.UUID(order_uuid) @@ -68,7 +68,7 @@ class WhenCreatingOrdersUsingOrdersResource(utils.BarbicanAPIBaseTestCase): meta=meta ) - self.assertEqual(resp.status_int, 202) + self.assertEqual(202, resp.status_int) def test_order_creation_should_fail_without_a_type(self): resp, _ = create_order( @@ -77,7 +77,7 @@ class WhenCreatingOrdersUsingOrdersResource(utils.BarbicanAPIBaseTestCase): expect_errors=True ) - self.assertEqual(resp.status_int, 400) + self.assertEqual(400, resp.status_int) def test_order_creation_should_fail_without_metadata(self): resp, _ = create_order( @@ -86,7 +86,7 @@ class WhenCreatingOrdersUsingOrdersResource(utils.BarbicanAPIBaseTestCase): expect_errors=True ) - self.assertEqual(resp.status_int, 400) + self.assertEqual(400, resp.status_int) def test_order_create_should_fail_w_unsupported_payload_content_type(self): meta = { @@ -101,7 +101,7 @@ class WhenCreatingOrdersUsingOrdersResource(utils.BarbicanAPIBaseTestCase): expect_errors=True ) - self.assertEqual(resp.status_int, 400) + self.assertEqual(400, resp.status_int) def test_order_creation_should_fail_with_bogus_content(self): resp = self.app.post( @@ -110,7 +110,7 @@ class WhenCreatingOrdersUsingOrdersResource(utils.BarbicanAPIBaseTestCase): headers={'Content-Type': 'application/json'}, expect_errors=True ) - self.assertEqual(resp.status_int, 400) + self.assertEqual(400, resp.status_int) def test_order_creation_should_fail_with_empty_dict(self): resp = self.app.post_json( @@ -119,7 +119,7 @@ class WhenCreatingOrdersUsingOrdersResource(utils.BarbicanAPIBaseTestCase): headers={'Content-Type': 'application/json'}, expect_errors=True ) - self.assertEqual(resp.status_int, 400) + self.assertEqual(400, resp.status_int) def test_order_creation_should_fail_without_content_type_header(self): resp = self.app.post( @@ -127,7 +127,7 @@ class WhenCreatingOrdersUsingOrdersResource(utils.BarbicanAPIBaseTestCase): 'doesn\'t matter. headers are validated first', expect_errors=True, ) - self.assertEqual(resp.status_int, 415) + self.assertEqual(415, resp.status_int) class WhenGettingOrdersListUsingOrdersResource(utils.BarbicanAPIBaseTestCase): @@ -138,7 +138,7 @@ class WhenGettingOrdersListUsingOrdersResource(utils.BarbicanAPIBaseTestCase): order_type='key', meta=generic_key_meta ) - self.assertEqual(resp.status_int, 202) + self.assertEqual(202, resp.status_int) # Get the list of orders resp = self.app.get( @@ -309,7 +309,7 @@ class WhenCreatingOrders(utils.BarbicanAPIBaseTestCase): order = order_repo.get(order_uuid, self.project_id) self.assertIsInstance(order, models.Order) self.assertEqual('key', order.type) - self.assertEqual(order.meta, order_meta) + self.assertEqual(order_meta, order.meta) def test_should_return_400_when_creating_with_empty_json(self): resp = self.app.post_json('/orders/', {}, expect_errors=True) diff --git a/barbican/tests/api/controllers/test_secrets.py b/barbican/tests/api/controllers/test_secrets.py index 0e5167278..62291c667 100644 --- a/barbican/tests/api/controllers/test_secrets.py +++ b/barbican/tests/api/controllers/test_secrets.py @@ -46,8 +46,8 @@ class WhenTestingSecretsResource(utils.BarbicanAPIBaseTestCase): self.assertEqual(201, resp.status_int) secret = secrets_repo.get(secret_uuid, self.project_id) - self.assertEqual(secret.name, 'test') - self.assertEqual(secret.encrypted_data, []) + self.assertEqual('test', secret.name) + self.assertEqual([], secret.encrypted_data) def test_can_create_new_secret_if_project_doesnt_exist(self): # Build new context @@ -105,7 +105,7 @@ class WhenTestingSecretsResource(utils.BarbicanAPIBaseTestCase): local_datetime = timeutils.parse_isotime(target_expiration) datetime_utc = timeutils.normalize_time(local_datetime) - self.assertEqual(secret.expiration, datetime_utc) + self.assertEqual(datetime_utc, secret.expiration) @mock.patch('barbican.plugin.resources.store_secret') def test_can_create_new_secret_meta_w_transport_key(self, mocked_store): @@ -202,7 +202,7 @@ class WhenGettingSecretsList(utils.BarbicanAPIBaseTestCase): name='secret mission' ) - self.assertEqual(create_resp.status_int, 201) + self.assertEqual(201, create_resp.status_int) params = {'name': 'secret mission'} @@ -210,7 +210,7 @@ class WhenGettingSecretsList(utils.BarbicanAPIBaseTestCase): self.assertEqual(200, get_resp.status_int) secret_list = get_resp.json.get('secrets') - self.assertEqual(secret_list[0].get('name'), 'secret mission') + self.assertEqual('secret mission', secret_list[0].get('name')) def test_list_secrets(self): # Creating a secret to be retrieved later @@ -254,7 +254,7 @@ class WhenGettingSecretsList(utils.BarbicanAPIBaseTestCase): self.assertEqual(200, get_resp.status_int) secret_list = get_resp.json.get('secrets') - self.assertEqual(len(secret_list), 0) + self.assertEqual(0, len(secret_list)) # These should never exist in this scenario self.assertNotIn('previous', get_resp.json) @@ -330,7 +330,7 @@ class WhenGettingPuttingOrDeletingSecret(utils.BarbicanAPIBaseTestCase): ) decoded = 'k]\xb7' - self.assertEqual(get_resp.body, decoded) + self.assertEqual(decoded, get_resp.body) def test_returns_404_on_get_when_not_found(self): get_resp = self.app.get( @@ -590,7 +590,7 @@ class WhenGettingPuttingOrDeletingSecret(utils.BarbicanAPIBaseTestCase): ) self.assertEqual(404, delete_resp.status_int) - self.assertEqual(delete_resp.content_type, 'application/json') + self.assertEqual('application/json', delete_resp.content_type) def test_delete_with_json_accept_header(self): resp, secret_uuid = create_secret( diff --git a/barbican/tests/api/controllers/test_versions.py b/barbican/tests/api/controllers/test_versions.py index 5ac525f7b..da4506ef5 100644 --- a/barbican/tests/api/controllers/test_versions.py +++ b/barbican/tests/api/controllers/test_versions.py @@ -43,5 +43,5 @@ class WhenTestingVersionsResource(utils.BarbicanAPIBaseTestCase): # might start using decimal numbers in the future. So when that happens # this test will still be valid. self.assertIn('v1', v1_info['id']) - self.assertEqual(len(v1_info['media-types']), 1) - self.assertEqual(v1_info['media-types'][0]['base'], 'application/json') + self.assertEqual(1, len(v1_info['media-types'])) + self.assertEqual('application/json', v1_info['media-types'][0]['base'])