openstack
/
barbican
Code Issues Proposed changes

Fix order of arguments in assertEqual 

Some tests used incorrect order assertEqual(observed, expected).
The correct order expected by testtools is assertEqual(expected, observed).

Change-Id: I1f5725e48f6de14379e77fe6edbf88d0a8b706fc
Partial-Bug: #1259292
This commit is contained in:
Pradeep Kumar Singh 2015-09-29 14:58:02 +05:30
parent bbe0716360
commit c6d74e21de
5 changed files with 117 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
barbican/tests/api/test_resources.py
View File

@ -381,7 +381,7 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
self.secret_repo.get_secret_by_id.assert_called_once_with(
entity_id=self.secret.id,
suppress_exception=True)
self.assertEqual(resp.status_int, 200)
self.assertEqual(200, resp.status_int)
self.assertNotIn('content_encodings', resp.namespace)
self.assertIn('content_types', resp.namespace)
@ -404,9 +404,9 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
self.secret_repo.get_secret_by_id.assert_called_once_with(
entity_id=self.secret.id,
suppress_exception=True)
self.assertEqual(resp.status_int, 200)
self.assertEqual(200, resp.status_int)
self.assertEqual(resp.body, data)
self.assertEqual(data, resp.body)
mock_get_secret.assert_called_once_with(
'text/plain',
self.secret,
@ -431,9 +431,9 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
self.secret_repo.get_secret_by_id.assert_called_once_with(
entity_id=self.secret.id,
suppress_exception=True)
self.assertEqual(resp.status_int, 200)
self.assertEqual(200, resp.status_int)
self.assertEqual(resp.body, data)
self.assertEqual(data, resp.body)
mock_get_secret.assert_called_once_with(
'text/plain',
self.secret,
@ -460,9 +460,9 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
self.secret_repo.get_secret_by_id.assert_called_once_with(
entity_id=self.secret.id,
suppress_exception=True)
self.assertEqual(resp.status_int, 200)
self.assertEqual(200, resp.status_int)
self.assertEqual(resp.body, data)
self.assertEqual(data, resp.body)
mock_get_secret.assert_called_once_with(
'text/plain',
self.secret,
@ -488,7 +488,7 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
self.secret_repo.get_secret_by_id.assert_called_once_with(
entity_id=self.secret.id,
suppress_exception=True)
self.assertEqual(resp.status_int, 400)
self.assertEqual(400, resp.status_int)
@testcase.attr('deprecated')
@mock.patch('barbican.plugin.resources.get_secret')
@ -508,7 +508,7 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
self.secret_repo.get_secret_by_id.assert_called_once_with(
entity_id=self.secret.id,
suppress_exception=True)
self.assertEqual(resp.status_int, 400)
self.assertEqual(400, resp.status_int)
@mock.patch('barbican.plugin.resources.get_transport_key_id_for_retrieval')
def test_should_get_secret_meta_for_binary(self, mock_get_transport_key):
@ -528,7 +528,7 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
entity_id=self.secret.id,
suppress_exception=True)
self.assertEqual(resp.status_int, 200)
self.assertEqual(200, resp.status_int)
self.assertIsNotNone(resp.namespace)
self.assertIn('content_types', resp.namespace)
@ -555,7 +555,7 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
entity_id=self.secret.id,
suppress_exception=True)
self.assertEqual(resp.status_int, 200)
self.assertEqual(200, resp.status_int)
self.assertIsNotNone(resp.namespace)
self.assertIn('content_types', resp.namespace)
@ -563,9 +563,8 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
six.itervalues(resp.namespace['content_types']))
self.assertIn('transport_key_ref', resp.namespace)
self.assertEqual(
resp.namespace['transport_key_ref'],
hrefs.convert_transport_key_to_href(
self.transport_key_id)
hrefs.convert_transport_key_to_href(self.transport_key_id),
resp.namespace['transport_key_ref']
)
@testcase.attr('deprecated')
@ -586,7 +585,7 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
}
)
self.assertEqual(resp.body, data)
self.assertEqual(data, resp.body)
mock_get_secret.assert_called_once_with(
'application/octet-stream',
@ -608,7 +607,7 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
headers={'Accept': 'text/plain', 'Content-Type': 'text/plain'},
)
self.assertEqual(resp.status_int, 204)
self.assertEqual(204, resp.status_int)
mock_store_secret.assert_called_once_with(
unencrypted_raw='plain text',
@ -634,7 +633,7 @@ class WhenGettingPuttingOrDeletingSecretUsingSecretResource(FunctionalTest):
},
)
self.assertEqual(resp.status_int, 204)
self.assertEqual(204, resp.status_int)
mock_store_secret.assert_called_once_with(
unencrypted_raw='plain text',
@ -815,7 +814,7 @@ class WhenCreatingConsumersUsingConsumersResource(FunctionalTest):
'/containers/{0}/consumers/'.format(self.container.id),
self.consumer_ref
)
self.assertEqual(resp.status_int, 200)
self.assertEqual(200, resp.status_int)
self.assertNotIn(self.external_project_id, resp.headers['Location'])
args, kwargs = self.consumer_repo.create_or_update_from.call_args
@ -828,7 +827,7 @@ class WhenCreatingConsumersUsingConsumersResource(FunctionalTest):
'',
expect_errors=True
)
self.assertEqual(resp.status_int, 415)
self.assertEqual(415, resp.status_int)
def test_should_404_consumer_bad_container_id(self):
self.container_repo.get.side_effect = excep.NotFound()
@ -837,7 +836,7 @@ class WhenCreatingConsumersUsingConsumersResource(FunctionalTest):
self.consumer_ref, expect_errors=True
)
self.container_repo.get.side_effect = None
self.assertEqual(resp.status_int, 404)
self.assertEqual(404, resp.status_int)
def test_should_raise_exception_when_container_ref_doesnt_exist(self):
self.container_repo.get.return_value = None
@ -846,7 +845,7 @@ class WhenCreatingConsumersUsingConsumersResource(FunctionalTest):
self.consumer_ref,
expect_errors=True
)
self.assertEqual(resp.status_int, 404)
self.assertEqual(404, resp.status_int)
class WhenGettingOrDeletingConsumersUsingConsumerResource(FunctionalTest):
@ -922,7 +921,7 @@ class WhenGettingOrDeletingConsumersUsingConsumerResource(FunctionalTest):
resp = self.app.get('/containers/{0}/consumers/'.format(
self.container.id
))
self.assertEqual(resp.status_int, 200)
self.assertEqual(200, resp.status_int)
self.consumer_repo.get_by_container_id.assert_called_once_with(
self.container.id,
@ -940,28 +939,28 @@ class WhenGettingOrDeletingConsumersUsingConsumerResource(FunctionalTest):
'bad_id'
), expect_errors=True)
self.container_repo.get.side_effect = None
self.assertEqual(resp.status_int, 404)
self.assertEqual(404, resp.status_int)
def test_should_get_consumer_by_id(self):
self.consumer_repo.get.return_value = self.consumer
resp = self.app.get('/containers/{0}/consumers/{1}/'.format(
self.container.id, self.consumer.id
))
self.assertEqual(resp.status_int, 200)
self.assertEqual(200, resp.status_int)
def test_should_404_with_bad_consumer_id(self):
self.consumer_repo.get.return_value = None
resp = self.app.get('/containers/{0}/consumers/{1}/'.format(
self.container.id, 'bad_id'
), expect_errors=True)
self.assertEqual(resp.status_int, 404)
self.assertEqual(404, resp.status_int)
def test_should_get_no_consumers(self):
self.consumer_repo.get_by_container_id.return_value = ([], 0, 0, 0)
resp = self.app.get('/containers/{0}/consumers/'.format(
self.container.id
))
self.assertEqual(resp.status_int, 200)
self.assertEqual(200, resp.status_int)
def test_should_delete_consumer(self):
self.app.delete_json('/containers/{0}/consumers/'.format(
@ -977,7 +976,7 @@ class WhenGettingOrDeletingConsumersUsingConsumerResource(FunctionalTest):
'',
expect_errors=True
)
self.assertEqual(resp.status_int, 415)
self.assertEqual(415, resp.status_int)
def test_should_404_on_delete_when_consumer_not_found(self):
old_return = self.consumer_repo.get_by_values.return_value
@ -986,9 +985,9 @@ class WhenGettingOrDeletingConsumersUsingConsumerResource(FunctionalTest):
self.container.id
), self.consumer_ref, expect_errors=True)
self.consumer_repo.get_by_values.return_value = old_return
self.assertEqual(resp.status_int, 404)
self.assertEqual(404, resp.status_int)
# Error response should have json content type
self.assertEqual(resp.content_type, "application/json")
self.assertEqual("application/json", resp.content_type)
def test_should_404_on_delete_when_consumer_not_found_later(self):
self.consumer_repo.delete_entity_by_id.side_effect = excep.NotFound()
@ -996,9 +995,9 @@ class WhenGettingOrDeletingConsumersUsingConsumerResource(FunctionalTest):
self.container.id
), self.consumer_ref, expect_errors=True)
self.consumer_repo.delete_entity_by_id.side_effect = None
self.assertEqual(resp.status_int, 404)
self.assertEqual(404, resp.status_int)
# Error response should have json content type
self.assertEqual(resp.content_type, "application/json")
self.assertEqual("application/json", resp.content_type)
def test_should_delete_consumers_on_container_delete(self):
consumers = [self.consumer, self.consumer2]
@ -1008,7 +1007,7 @@ class WhenGettingOrDeletingConsumersUsingConsumerResource(FunctionalTest):
resp = self.app.delete(
'/containers/{0}/'.format(self.container.id)
)
self.assertEqual(resp.status_int, 204)
self.assertEqual(204, resp.status_int)
# Verify consumers were deleted
calls = []
@ -1027,7 +1026,7 @@ class WhenGettingOrDeletingConsumersUsingConsumerResource(FunctionalTest):
resp = self.app.delete(
'/containers/{0}/'.format(self.container.id)
)
self.assertEqual(resp.status_int, 204)
self.assertEqual(204, resp.status_int)
# Verify consumers were deleted
calls = []
@ -1132,7 +1131,7 @@ class WhenPerformingUnallowedOperationsOnConsumers(FunctionalTest):
self.consumer_ref,
expect_errors=True
)
self.assertEqual(resp.status_int, 405)
self.assertEqual(405, resp.status_int)
def test_should_not_allow_post_on_consumer_by_id(self):
self.consumer_repo.get.return_value = self.consumer
@ -1142,7 +1141,7 @@ class WhenPerformingUnallowedOperationsOnConsumers(FunctionalTest):
self.consumer_ref,
expect_errors=True
)
self.assertEqual(resp.status_int, 405)
self.assertEqual(405, resp.status_int)
def test_should_not_allow_put_on_consumer_by_id(self):
self.consumer_repo.get.return_value = self.consumer
@ -1152,7 +1151,7 @@ class WhenPerformingUnallowedOperationsOnConsumers(FunctionalTest):
self.consumer_ref,
expect_errors=True
)
self.assertEqual(resp.status_int, 405)
self.assertEqual(405, resp.status_int)
def test_should_not_allow_delete_on_consumer_by_id(self):
self.consumer_repo.get.return_value = self.consumer
@ -1161,4 +1160,4 @@ class WhenPerformingUnallowedOperationsOnConsumers(FunctionalTest):
self.consumer.id),
expect_errors=True
)
self.assertEqual(resp.status_int, 405)
self.assertEqual(405, resp.status_int)

14
barbican/tests/api/test_transport_keys_resource.py
View File

@ -173,7 +173,7 @@ class WhenGettingTransKeysListUsingTransportKeysResource(FunctionalTest):
resp = self.app.get('/transport_keys/',
self.params)
self.assertIn('total', resp.namespace)
self.assertEqual(resp.namespace['total'], self.total)
self.assertEqual(self.total, resp.namespace['total'])
def test_should_handle_no_transport_keys(self):
@ -236,7 +236,7 @@ class WhenCreatingTransKeysListUsingTransportKeysResource(FunctionalTest):
'/transport_keys/',
self.transport_key_req
)
self.assertEqual(resp.status_int, 201)
self.assertEqual(201, resp.status_int)
args, kwargs = self.repo.create_from.call_args
order = args[0]
@ -248,7 +248,7 @@ class WhenCreatingTransKeysListUsingTransportKeysResource(FunctionalTest):
{},
expect_errors=True
)
self.assertEqual(resp.status_int, 400)
self.assertEqual(400, resp.status_int)
def test_should_raise_add_new_transport_key_bad_json(self):
resp = self.app.post(
@ -257,7 +257,7 @@ class WhenCreatingTransKeysListUsingTransportKeysResource(FunctionalTest):
expect_errors=True,
content_type='application/json'
)
self.assertEqual(resp.status_int, 400)
self.assertEqual(400, resp.status_int)
def test_should_raise_add_new_transport_key_no_content_type_header(self):
resp = self.app.post(
@ -265,7 +265,7 @@ class WhenCreatingTransKeysListUsingTransportKeysResource(FunctionalTest):
self.transport_key_req,
expect_errors=True,
)
self.assertEqual(resp.status_int, 415)
self.assertEqual(415, resp.status_int)
class WhenGettingOrDeletingTransKeyUsingTransportKeyResource(FunctionalTest):
@ -311,7 +311,7 @@ class WhenGettingOrDeletingTransKeyUsingTransportKeyResource(FunctionalTest):
'/transport_keys/{0}/'.format(self.tkey.id),
expect_errors=True
)
self.assertEqual(resp.status_int, 404)
self.assertEqual(404, resp.status_int)
def test_should_delete_transport_key(self):
self.app.delete('/transport_keys/{0}/'.format(self.tkey.id))
@ -326,4 +326,4 @@ class WhenGettingOrDeletingTransKeyUsingTransportKeyResource(FunctionalTest):
'/transport_keys/{0}/'.format(self.tkey.id),
expect_errors=True
)
self.assertEqual(resp.status_int, 404)
self.assertEqual(404, resp.status_int)

8
barbican/tests/cmd/test_cmd.py
View File

@ -37,9 +37,9 @@ class WhenInvokingRetryServiceCommand(utils.BaseTestCase):
retry_scheduler.main()
self.assertEqual(mock_queue_init.call_count, 1)
self.assertEqual(mock_service_launch.call_count, 1)
self.assertEqual(mock_periodic_server.call_count, 1)
self.assertEqual(1, mock_queue_init.call_count)
self.assertEqual(1, mock_service_launch.call_count)
self.assertEqual(1, mock_periodic_server.call_count)
@mock.patch('oslo_log.log.setup')
@mock.patch('sys.exit')
@ -49,4 +49,4 @@ class WhenInvokingRetryServiceCommand(utils.BaseTestCase):
retry_scheduler.main()
self.assertEqual(mock_sys_exit.call_count, 1)
self.assertEqual(1, mock_sys_exit.call_count)

18
barbican/tests/common/test_utils.py
View File

@ -41,14 +41,12 @@ class WhenTestingHostnameForRefsGetter(test_utils.BaseTestCase):
def test_hostname_for_refs(self):
uri = utils.hostname_for_refs(resource=self.resource)
self.assertEqual(uri, "{0}/{1}/{2}".format(self.host,
self.version,
self.resource))
self.assertEqual("{0}/{1}/{2}".format(self.host, self.version,
self.resource), uri)
def test_hostname_for_refs_no_resource(self):
uri = utils.hostname_for_refs()
self.assertEqual(uri, "{0}/{1}".format(self.host,
self.version))
self.assertEqual("{0}/{1}".format(self.host, self.version), uri)
class WhenTestingAcceptEncodingGetter(test_utils.BaseTestCase):
@ -62,7 +60,7 @@ class WhenTestingAcceptEncodingGetter(test_utils.BaseTestCase):
self.req.get_header.return_value = '*'
ae = utils.get_accepted_encodings(self.req)
self.req.get_header.assert_called_once_with('Accept-Encoding')
self.assertEqual(ae, ['*'])
self.assertEqual(['*'], ae)
def test_returns_none_for_empty_encoding(self):
self.req.get_header.return_value = None
@ -72,17 +70,17 @@ class WhenTestingAcceptEncodingGetter(test_utils.BaseTestCase):
def test_parses_single_accept_with_quality_value(self):
self.req.get_header.return_value = 'base64;q=0.7'
ae = utils.get_accepted_encodings(self.req)
self.assertEqual(ae, ['base64'])
self.assertEqual(['base64'], ae)
def test_parses_more_than_one_encoding(self):
self.req.get_header.return_value = 'base64, gzip'
ae = utils.get_accepted_encodings(self.req)
self.assertEqual(ae, ['base64', 'gzip'])
self.assertEqual(['base64', 'gzip'], ae)
def test_can_sort_by_quality_value(self):
self.req.get_header.return_value = 'base64;q=0.5, gzip;q=0.6, compress'
ae = utils.get_accepted_encodings(self.req)
self.assertEqual(ae, ['compress', 'gzip', 'base64'])
self.assertEqual(['compress', 'gzip', 'base64'], ae)
def test_returns_none_on_invalid_quality_type(self):
self.req.get_header.return_value = 'base64;q=three'
@ -102,7 +100,7 @@ class WhenTestingAcceptEncodingGetter(test_utils.BaseTestCase):
def test_ignores_encoding_with_zero_quality_value(self):
self.req.get_header.return_value = 'base64;q=0.5, gzip;q=0.0, compress'
ae = utils.get_accepted_encodings(self.req)
self.assertEqual(ae, ['compress', 'base64'])
self.assertEqual(['compress', 'base64'], ae)
class WhenTestingGenerateFullClassnameForInstance(test_utils.BaseTestCase):

124
barbican/tests/model/test_models.py
View File

@ -39,13 +39,13 @@ class WhenCreatingNewSecret(utils.BaseTestCase):
date_time = datetime.datetime.now().isoformat()
self.parsed_secret['expiration'] = date_time
secret = models.Secret(self.parsed_secret)
self.assertEqual(secret.name, self.parsed_secret['name'])
self.assertEqual(secret.secret_type, self.parsed_secret['secret_type'])
self.assertEqual(secret.algorithm, self.parsed_secret['algorithm'])
self.assertEqual(secret.bit_length, self.parsed_secret['bit_length'])
self.assertEqual(secret.mode, self.parsed_secret['mode'])
self.assertEqual(self.parsed_secret['name'], secret.name)
self.assertEqual(self.parsed_secret['secret_type'], secret.secret_type)
self.assertEqual(self.parsed_secret['algorithm'], secret.algorithm)
self.assertEqual(self.parsed_secret['bit_length'], secret.bit_length)
self.assertEqual(self.parsed_secret['mode'], secret.mode)
self.assertIsInstance(secret.expiration, datetime.datetime)
self.assertEqual(secret.creator_id, self.parsed_secret['creator_id'])
self.assertEqual(self.parsed_secret['creator_id'], secret.creator_id)
self.assertEqual(secret.created_at, secret.updated_at)
fields = secret.to_dict_fields()
@ -61,7 +61,7 @@ class WhenCreatingNewSecret(utils.BaseTestCase):
secret_spec['expiration'] = date_time
del secret_spec['secret_type']
secret = models.Secret(secret_spec)
self.assertEqual(secret.secret_type, self.parsed_secret['secret_type'])
self.assertEqual(self.parsed_secret['secret_type'], secret.secret_type)
class WhenCreatingNewOrder(utils.BaseTestCase):
@ -80,13 +80,13 @@ class WhenCreatingNewOrder(utils.BaseTestCase):
def test_new_order_is_created(self):
order = models.Order(self.parsed_order)
self.assertEqual(order.type, self.parsed_order['type'])
self.assertEqual(order.meta, self.parsed_order['meta'])
self.assertEqual(order.sub_status, self.parsed_order['sub_status'])
self.assertEqual(order.creator_id, self.parsed_order['creator_id'])
self.assertEqual(self.parsed_order['type'], order.type)
self.assertEqual(self.parsed_order['meta'], order.meta)
self.assertEqual(self.parsed_order['sub_status'], order.sub_status)
self.assertEqual(self.parsed_order['creator_id'], order.creator_id)
self.assertEqual(
order.sub_status_message,
self.parsed_order['sub_status_message']
self.parsed_order['sub_status_message'],
order.sub_status_message
)
fields = order.to_dict_fields()
self.assertEqual(self.parsed_order['sub_status'], fields['sub_status'])
@ -112,27 +112,27 @@ class WhenCreatingNewContainer(utils.BaseTestCase):
def test_new_container_is_created_from_dict(self):
container = models.Container(self.parsed_container)
self.assertEqual(container.name, self.parsed_container['name'])
self.assertEqual(container.type, self.parsed_container['type'])
self.assertEqual(container.creator_id,
self.parsed_container['creator_id'])
self.assertEqual(len(container.container_secrets),
len(self.parsed_container['secret_refs']))
self.assertEqual(self.parsed_container['name'], container.name)
self.assertEqual(self.parsed_container['type'], container.type)
self.assertEqual(self.parsed_container['creator_id'],
container.creator_id)
self.assertEqual(len(self.parsed_container['secret_refs']),
len(container.container_secrets))
self.assertEqual(container.container_secrets[0].name,
self.parsed_container['secret_refs'][0]['name'])
self.assertEqual(container.container_secrets[0].secret_id,
self.parsed_container['secret_refs'][0]['secret_ref'])
self.assertEqual(self.parsed_container['secret_refs'][0]['name'],
container.container_secrets[0].name)
self.assertEqual(self.parsed_container['secret_refs'][0]['secret_ref'],
container.container_secrets[0].secret_id)
self.assertEqual(container.container_secrets[1].name,
self.parsed_container['secret_refs'][1]['name'])
self.assertEqual(container.container_secrets[1].secret_id,
self.parsed_container['secret_refs'][1]['secret_ref'])
self.assertEqual(self.parsed_container['secret_refs'][1]['name'],
container.container_secrets[1].name)
self.assertEqual(self.parsed_container['secret_refs'][1]['secret_ref'],
container.container_secrets[1].secret_id)
self.assertEqual(container.container_secrets[2].name,
self.parsed_container['secret_refs'][2]['name'])
self.assertEqual(container.container_secrets[2].secret_id,
self.parsed_container['secret_refs'][2]['secret_ref'])
self.assertEqual(self.parsed_container['secret_refs'][2]['name'],
container.container_secrets[2].name)
self.assertEqual(self.parsed_container['secret_refs'][2]['secret_ref'],
container.container_secrets[2].secret_id)
fields = container.to_dict_fields()
self.assertEqual(self.parsed_container['name'], fields['name'])
self.assertEqual(self.parsed_container['type'], fields['type'])
@ -142,38 +142,38 @@ class WhenCreatingNewContainer(utils.BaseTestCase):
def test_new_certificate_container_is_created_from_dict(self):
self.parsed_container['type'] = 'certificate'
container = models.Container(self.parsed_container)
self.assertEqual(container.name, self.parsed_container['name'])
self.assertEqual(container.type, self.parsed_container['type'])
self.assertEqual(container.creator_id,
self.parsed_container['creator_id'])
self.assertEqual(len(container.container_secrets),
len(self.parsed_container['secret_refs']))
self.assertEqual(self.parsed_container['name'], container.name)
self.assertEqual(self.parsed_container['type'], container.type)
self.assertEqual(self.parsed_container['creator_id'],
container.creator_id)
self.assertEqual(len(self.parsed_container['secret_refs']),
len(container.container_secrets))
self.assertEqual(container.container_secrets[0].name,
self.parsed_container['secret_refs'][0]['name'])
self.assertEqual(container.container_secrets[0].secret_id,
self.parsed_container['secret_refs'][0]['secret_ref'])
self.assertEqual(self.parsed_container['secret_refs'][0]['name'],
container.container_secrets[0].name)
self.assertEqual(self.parsed_container['secret_refs'][0]['secret_ref'],
container.container_secrets[0].secret_id)
self.assertEqual(container.container_secrets[1].name,
self.parsed_container['secret_refs'][1]['name'])
self.assertEqual(container.container_secrets[1].secret_id,
self.parsed_container['secret_refs'][1]['secret_ref'])
self.assertEqual(self.parsed_container['secret_refs'][1]['name'],
container.container_secrets[1].name,)
self.assertEqual(self.parsed_container['secret_refs'][1]['secret_ref'],
container.container_secrets[1].secret_id)
self.assertEqual(container.container_secrets[2].name,
self.parsed_container['secret_refs'][2]['name'])
self.assertEqual(container.container_secrets[2].secret_id,
self.parsed_container['secret_refs'][2]['secret_ref'])
self.assertEqual(self.parsed_container['secret_refs'][2]['name'],
container.container_secrets[2].name)
self.assertEqual(self.parsed_container['secret_refs'][2]['secret_ref'],
container.container_secrets[2].secret_id)
def test_parse_secret_ref_uri(self):
self.parsed_container['secret_refs'][0]['secret_ref'] = (
'http://localhost:9110/123/secrets/123456')
container = models.Container(self.parsed_container)
self.assertEqual(container.container_secrets[0].secret_id, '123456')
self.assertEqual('123456', container.container_secrets[0].secret_id)
self.parsed_container['secret_refs'][0]['secret_ref'] = (
'http://localhost:9110/123/secrets/123456/')
container = models.Container(self.parsed_container)
self.assertEqual(container.container_secrets[0].secret_id, '123456')
self.assertEqual('123456', container.container_secrets[0].secret_id)
class WhenCreatingNewConsumer(utils.BaseTestCase):
@ -188,9 +188,9 @@ class WhenCreatingNewConsumer(utils.BaseTestCase):
consumer = models.ContainerConsumerMetadatum(self.container_id,
self.project_id,
self.parsed_consumer)
self.assertEqual(consumer.name, self.parsed_consumer['name'])
self.assertEqual(consumer.URL, self.parsed_consumer['URL'])
self.assertEqual(consumer.status, models.States.ACTIVE)
self.assertEqual(self.parsed_consumer['name'], consumer.name)
self.assertEqual(self.parsed_consumer['URL'], consumer.URL)
self.assertEqual(models.States.ACTIVE, consumer.status)
def test_new_consumer_has_correct_hash(self):
consumer_one = models.ContainerConsumerMetadatum(self.container_id,
@ -213,7 +213,7 @@ class WhenProcessingJsonBlob(utils.BaseTestCase):
def test_process_bind_param_w_dict(self):
res = self.json_blob.process_bind_param({'test': True}, None)
self.assertEqual(res, '{"test": true}')
self.assertEqual('{"test": true}', res)
def test_process_result_value_w_json_str(self):
res = self.json_blob.process_result_value('{"test": true}', None)
@ -239,9 +239,9 @@ class WhenCreatingOrderRetryTask(utils.BaseTestCase):
order_retry_task.retry_args = ["one", "two"]
order_retry_task.retry_kwargs = {"three": "four"}
self.assertEqual(order_retry_task.order_id, order.id)
self.assertEqual(order_retry_task.retry_task, "foobar")
self.assertEqual(order_retry_task.retry_at, at)
self.assertEqual(order.id, order_retry_task.order_id)
self.assertEqual("foobar", order_retry_task.retry_task)
self.assertEqual(at, order_retry_task.retry_at)
self.assertEqual(
["one", "two"],
order_retry_task.retry_args,
@ -364,7 +364,7 @@ class WhenCreatingNewSecretACL(utils.BaseTestCase):
def test_new_secretacl_for_bare_minimum_input(self):
acl = models.SecretACL(self.secret_id, self.operation,
None, None)
self.assertEqual(acl.secret_id, self.secret_id)
self.assertEqual(self.secret_id, acl.secret_id)
self.assertEqual(0, len(acl.acl_users))
self.assertEqual(self.operation, acl.operation)
self.assertEqual(None, acl.project_access)
@ -406,9 +406,9 @@ class WhenCreatingNewContainerACL(utils.BaseTestCase):
def test_new_containeracl_for_given_all_input(self):
acl = models.ContainerACL(self.container_id, self.operation,
self.project_access, self.user_ids)
self.assertEqual(acl.container_id, self.container_id)
self.assertEqual(acl.operation, self.operation)
self.assertEqual(acl.project_access, self.project_access)
self.assertEqual(self.container_id, acl.container_id)
self.assertEqual(self.operation, acl.operation)
self.assertEqual(self.project_access, acl.project_access)
self.assertTrue(all(acl_user.user_id in self.user_ids for acl_user
in acl.acl_users))