diff --git a/barbican/tests/plugin/test_dogtag.py b/barbican/tests/plugin/test_dogtag.py index 10e3e7d2b..1258be6c7 100644 --- a/barbican/tests/plugin/test_dogtag.py +++ b/barbican/tests/plugin/test_dogtag.py @@ -183,8 +183,8 @@ class WhenTestingDogtagKRAPlugin(utils.BaseTestCase): } result = self.plugin.get_secret(secret_metadata) - self.assertEqual(result.secret, - test_key.exportKey('PEM').encode('utf-8')) + self.assertEqual(test_key.exportKey('PEM').encode('utf-8'), + result.secret) def test_get_public_key(self): test_public_key = RSA.generate(2048).publickey() @@ -201,8 +201,8 @@ class WhenTestingDogtagKRAPlugin(utils.BaseTestCase): } result = self.plugin.get_secret(secret_metadata) - self.assertEqual(result.secret, - test_public_key.exportKey('PEM').encode('utf-8')) + self.assertEqual(test_public_key.exportKey('PEM').encode('utf-8'), + result.secret) def test_store_passphrase_for_using_in_private_key_retrieval(self): @@ -219,9 +219,10 @@ class WhenTestingDogtagKRAPlugin(utils.BaseTestCase): asym_key_DTO = self.plugin.generate_asymmetric_key(key_spec) self.assertEqual( + '1', asym_key_DTO.private_key_meta[ - dogtag_import.DogtagKRAPlugin.PASSPHRASE_KEY_ID], - '1') + dogtag_import.DogtagKRAPlugin.PASSPHRASE_KEY_ID] + ) self.keyclient_mock.generate_asymmetric_key.assert_called_once_with( mock.ANY, @@ -326,19 +327,19 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.profile_id, order_meta) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CERTIFICATE_GENERATED, + self.assertEqual(cm.CertificateStatus.CERTIFICATE_GENERATED, + result_dto.status, "result_dto status incorrect") - self.assertEqual(result_dto.certificate, - self.cert_encoded_mock) + self.assertEqual(self.cert_encoded_mock, + result_dto.certificate) - self.assertEqual(result_dto.intermediates, - self.cert_pkcs7_mock) + self.assertEqual(self.cert_pkcs7_mock, + result_dto.intermediates) self.assertEqual( - plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID), - self.request_id_mock + self.request_id_mock, + plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID) ) def _process_simple_cmc_cert_request(self, order_meta, plugin_meta): @@ -368,13 +369,13 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.certclient_mock.submit_enrollment_request.assert_called_once_with( enrollment_request) - self.assertEqual(result_dto.status, - cm.CertificateStatus.WAITING_FOR_CA, + self.assertEqual(cm.CertificateStatus.WAITING_FOR_CA, + result_dto.status, "result_dto status incorrect") self.assertEqual( - plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID), - self.request_id_mock + self.request_id_mock, + plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID) ) def test_issue_simple_cmc_request(self): @@ -445,12 +446,12 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): result_dto = self.plugin.issue_certificate_request( self.order_id, order_meta, plugin_meta, self.barbican_meta_dto) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + self.assertEqual(cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + result_dto.status, "result_dto status incorrect") - self.assertEqual(result_dto.status_message, - "No profile_id specified") + self.assertEqual("No profile_id specified", + result_dto.status_message) def test_issue_return_data_error_with_request_rejected(self): order_meta = {dogtag_import.DogtagCAPlugin.PROFILE_ID: self.profile_id} @@ -469,13 +470,13 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.profile_id, order_meta) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + self.assertEqual(cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + result_dto.status, "result_dto status incorrect") self.assertEqual( + self.request_id_mock, plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID), - self.request_id_mock ) def test_issue_return_canceled_with_request_canceled(self): @@ -495,13 +496,13 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.profile_id, order_meta) - self.assertEqual(result_dto.status, - cm.CertificateStatus.REQUEST_CANCELED, + self.assertEqual(cm.CertificateStatus.REQUEST_CANCELED, + result_dto.status, "result_dto status incorrect") self.assertEqual( + self.request_id_mock, plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID), - self.request_id_mock ) def test_issue_return_waiting_with_request_pending(self): @@ -521,13 +522,13 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.profile_id, order_meta) - self.assertEqual(result_dto.status, - cm.CertificateStatus.WAITING_FOR_CA, + self.assertEqual(cm.CertificateStatus.WAITING_FOR_CA, + result_dto.status, "result_dto status incorrect") self.assertEqual( - plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID), - self.request_id_mock + self.request_id_mock, + plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID) ) def test_issue_raises_error_request_complete_no_cert(self): @@ -549,8 +550,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): ) self.assertEqual( - plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID), - self.request_id_mock + self.request_id_mock, + plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID) ) def test_issue_raises_error_request_unknown_status(self): @@ -573,8 +574,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): ) self.assertEqual( - plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID), - self.request_id_mock + self.request_id_mock, + plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID) ) def test_issue_return_client_error_bad_request_exception(self): @@ -591,8 +592,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.profile_id, order_meta) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + self.assertEqual(cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + result_dto.status, "result_dto status incorrect") def test_issue_raises_error_pki_exception(self): @@ -625,8 +626,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.profile_id, order_meta) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CA_UNAVAILABLE_FOR_REQUEST, + self.assertEqual(cm.CertificateStatus.CA_UNAVAILABLE_FOR_REQUEST, + result_dto.status, "result_dto status incorrect") def test_cancel_request(self): @@ -643,8 +644,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.request_id_mock, self.review_response) - self.assertEqual(result_dto.status, - cm.CertificateStatus.REQUEST_CANCELED, + self.assertEqual(cm.CertificateStatus.REQUEST_CANCELED, + result_dto.status, "result_dto_status incorrect") def test_cancel_no_request_found(self): @@ -660,8 +661,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.certclient_mock.review_request.assert_called_once_with( self.request_id_mock) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + self.assertEqual(cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + result_dto.status, "result_dto_status incorrect") def test_cancel_conflicting_operation(self): @@ -679,8 +680,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.request_id_mock, self.review_response) - self.assertEqual(result_dto.status, - cm.CertificateStatus.INVALID_OPERATION, + self.assertEqual(cm.CertificateStatus.INVALID_OPERATION, + result_dto.status, "result_dto_status incorrect") def test_cancel_ca_unavailable(self): @@ -693,8 +694,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): result_dto = self.plugin.cancel_certificate_request( self.order_id, order_meta, plugin_meta, self.barbican_meta_dto) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CA_UNAVAILABLE_FOR_REQUEST, + self.assertEqual(cm.CertificateStatus.CA_UNAVAILABLE_FOR_REQUEST, + result_dto.status, "result_dto_status incorrect") def test_cancel_raise_error_no_request_id(self): @@ -726,12 +727,12 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.certclient_mock.get_cert.assert_called_once_with( self.cert_id_mock) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CERTIFICATE_GENERATED, + self.assertEqual(cm.CertificateStatus.CERTIFICATE_GENERATED, + result_dto.status, "result_dto_status incorrect") - self.assertEqual(result_dto.certificate, - self.cert_encoded_mock) + self.assertEqual(self.cert_encoded_mock, + result_dto.certificate) def test_check_status_raise_error_no_request_id(self): order_meta = mock.ANY @@ -759,12 +760,11 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.certclient_mock.get_request.assert_called_once_with( self.request_id_mock) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + self.assertEqual(cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + result_dto.status, "result_dto_status incorrect") - self.assertEqual(result_dto.certificate, - None) + self.assertEqual(None, result_dto.certificate) def test_check_status_canceled(self): order_meta = mock.ANY @@ -779,12 +779,11 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.certclient_mock.get_request.assert_called_once_with( self.request_id_mock) - self.assertEqual(result_dto.status, - cm.CertificateStatus.REQUEST_CANCELED, + self.assertEqual(cm.CertificateStatus.REQUEST_CANCELED, + result_dto.status, "result_dto_status incorrect") - self.assertEqual(result_dto.certificate, - None) + self.assertEqual(None, result_dto.certificate) def test_check_status_pending(self): order_meta = mock.ANY @@ -799,12 +798,11 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.certclient_mock.get_request.assert_called_once_with( self.request_id_mock) - self.assertEqual(result_dto.status, - cm.CertificateStatus.WAITING_FOR_CA, + self.assertEqual(cm.CertificateStatus.WAITING_FOR_CA, + result_dto.status, "result_dto_status incorrect") - self.assertEqual(result_dto.certificate, - None) + self.assertEqual(None, result_dto.certificate) def test_check_status_raises_error_complete_no_cert(self): order_meta = mock.ANY @@ -846,19 +844,19 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.profile_id, order_meta) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CERTIFICATE_GENERATED, + self.assertEqual(cm.CertificateStatus.CERTIFICATE_GENERATED, + result_dto.status, "result_dto_status incorrect") - self.assertEqual(result_dto.certificate, - self.cert_encoded_mock) + self.assertEqual(self.cert_encoded_mock, + result_dto.certificate) - self.assertEqual(result_dto.intermediates, - self.cert_pkcs7_mock) + self.assertEqual(self.cert_pkcs7_mock, + result_dto.intermediates) self.assertEqual( - plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID), - self.modified_request_id_mock + self.modified_request_id_mock, + plugin_meta.get(dogtag_import.DogtagCAPlugin.REQUEST_ID) ) def test_modify_no_request_found(self): @@ -874,8 +872,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.certclient_mock.review_request.assert_called_once_with( self.request_id_mock) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + self.assertEqual(cm.CertificateStatus.CLIENT_DATA_ISSUE_SEEN, + result_dto.status, "result_dto_status incorrect") def test_modify_conflicting_operation(self): @@ -893,8 +891,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): self.request_id_mock, self.review_response) - self.assertEqual(result_dto.status, - cm.CertificateStatus.INVALID_OPERATION, + self.assertEqual(cm.CertificateStatus.INVALID_OPERATION, + result_dto.status, "result_dto_status incorrect") def test_modify_ca_unavailable(self): @@ -907,8 +905,8 @@ class WhenTestingDogtagCAPlugin(utils.BaseTestCase): result_dto = self.plugin.modify_certificate_request( self.order_id, order_meta, plugin_meta, self.barbican_meta_dto) - self.assertEqual(result_dto.status, - cm.CertificateStatus.CA_UNAVAILABLE_FOR_REQUEST, + self.assertEqual(cm.CertificateStatus.CA_UNAVAILABLE_FOR_REQUEST, + result_dto.status, "result_dto_status incorrect") def test_modify_raise_error_no_request_id(self): diff --git a/barbican/tests/plugin/test_kmip.py b/barbican/tests/plugin/test_kmip.py index 28346cb49..71db446de 100644 --- a/barbican/tests/plugin/test_kmip.py +++ b/barbican/tests/plugin/test_kmip.py @@ -917,4 +917,4 @@ class WhenTestingKMIPSecretStore(utils.BaseTestCase): CONF = kss.CONF CONF.kmip_plugin.keyfile = '/some/path' kss.KMIPSecretStore(CONF) - self.assertEqual(len(m.mock_calls), 1) + self.assertEqual(1, len(m.mock_calls)) diff --git a/barbican/tests/plugin/test_resource.py b/barbican/tests/plugin/test_resource.py index 2a7fdf80c..869d5a3fe 100644 --- a/barbican/tests/plugin/test_resource.py +++ b/barbican/tests/plugin/test_resource.py @@ -189,12 +189,10 @@ class WhenTestingPluginResource(testtools.TestCase, ) self.assertEqual("rsa", secret_container.type) - self.assertEqual(self.moc_plugin.generate_asymmetric_key. - call_count, 1) - self.assertEqual(self.container_repo.create_from. - call_count, 1) - self.assertEqual(self.container_secret_repo.create_from. - call_count, 2) + self.assertEqual(1, + self.moc_plugin.generate_asymmetric_key.call_count) + self.assertEqual(1, self.container_repo.create_from.call_count) + self.assertEqual(2, self.container_secret_repo.create_from.call_count) def test_delete_secret_w_metadata(self): project_id = "some_id" diff --git a/barbican/tests/plugin/test_simple_certificate_manager.py b/barbican/tests/plugin/test_simple_certificate_manager.py index 2a30203b3..3683be786 100644 --- a/barbican/tests/plugin/test_simple_certificate_manager.py +++ b/barbican/tests/plugin/test_simple_certificate_manager.py @@ -63,7 +63,7 @@ class WhenTestingSimpleCertificateManagerPlugin(testtools.TestCase): cm.CertificateRequestType.SIMPLE_CMC_REQUEST, cm.CertificateRequestType.FULL_CMC_REQUEST, cm.CertificateRequestType.STORED_KEY_REQUEST] - self.assertEqual(result, supported_list) + self.assertEqual(supported_list, result) class WhenTestingSimpleCertificateEventManagerPlugin(testtools.TestCase): diff --git a/barbican/tests/plugin/test_snakeoil_ca.py b/barbican/tests/plugin/test_snakeoil_ca.py index 280582110..a429fd29e 100644 --- a/barbican/tests/plugin/test_snakeoil_ca.py +++ b/barbican/tests/plugin/test_snakeoil_ca.py @@ -78,7 +78,7 @@ class CaTestCase(BaseTestCase): self.assertEqual( ca.chain, crypto.dump_certificate(crypto.FILETYPE_PEM, ca.cert)) - self.assertNotEqual(ca.key, None) + self.assertNotEqual(None, ca.key) self.assertEqual("Test ST", subject.ST) self.assertEqual("Test L", subject.L) self.assertEqual("Test O", subject.O) @@ -269,12 +269,12 @@ class SnakeoilCAPluginTestCase(BaseTestCase): cert = crypto.load_certificate( crypto.FILETYPE_PEM, resp.certificate.decode('base64')) cert_subj = cert.get_subject() - self.assertEqual(cert_subj.C, 'US') - self.assertEqual(cert_subj.ST, 'OR') - self.assertEqual(cert_subj.L, 'Testlandia') - self.assertEqual(cert_subj.O, 'Testers Anon') - self.assertEqual(cert_subj.OU, 'Testers OU') - self.assertEqual(cert_subj.CN, 'Testing') + self.assertEqual('US', cert_subj.C) + self.assertEqual('OR', cert_subj.ST) + self.assertEqual('Testlandia', cert_subj.L) + self.assertEqual('Testers Anon', cert_subj.O) + self.assertEqual('Testers OU', cert_subj.OU) + self.assertEqual('Testing', cert_subj.CN) def test_issue_certificate_request_stored_key(self): req = certificate_utils.get_valid_csr_object() @@ -294,7 +294,7 @@ class SnakeoilCAPluginTestCase(BaseTestCase): self.assertEqual("No request_data specified", res.status_message) def test_get_default_ca_name(self): - self.assertEqual(self.plugin.get_default_ca_name(), "Snakeoil CA") + self.assertEqual("Snakeoil CA", self.plugin.get_default_ca_name()) def test_get_default_signing_cert(self): ca_cert = self.plugin.get_default_signing_cert() diff --git a/barbican/tests/plugin/test_store_crypto.py b/barbican/tests/plugin/test_store_crypto.py index dd4a2f453..854603391 100644 --- a/barbican/tests/plugin/test_store_crypto.py +++ b/barbican/tests/plugin/test_store_crypto.py @@ -181,7 +181,7 @@ class WhenTestingStoreCrypto(TestSecretStoreBase): # Verify encrypt plugin and method where invoked. encrypt_mock = self.encrypting_plugin.encrypt - self.assertEqual(encrypt_mock.call_count, 1) + self.assertEqual(1, encrypt_mock.call_count) args, kwargs = encrypt_mock.call_args test_encrypt_dto, test_kek_meta_dto, test_project_id = tuple(args) self.assertIsInstance(test_encrypt_dto, crypto.EncryptDTO) @@ -211,7 +211,7 @@ class WhenTestingStoreCrypto(TestSecretStoreBase): # Verify encrypt plugin and method where invoked. encrypt_mock = self.encrypting_plugin.encrypt - self.assertEqual(encrypt_mock.call_count, 1) + self.assertEqual(1, encrypt_mock.call_count) args, kwargs = encrypt_mock.call_args test_encrypt_dto, test_kek_meta_dto, test_project_id = tuple(args) self.assertIsInstance(test_encrypt_dto, crypto.EncryptDTO) @@ -245,7 +245,7 @@ class WhenTestingStoreCrypto(TestSecretStoreBase): # Verify decrypt plugin and method where invoked. decrypt_mock = self.retrieving_plugin.decrypt - self.assertEqual(decrypt_mock.call_count, 1) + self.assertEqual(1, decrypt_mock.call_count) args, kwargs = decrypt_mock.call_args ( test_decrypt, @@ -315,7 +315,7 @@ class WhenTestingStoreCrypto(TestSecretStoreBase): # Verify KEK objects finder was invoked. method_target = self.find_or_create_kek_objects_patcher.target method_mock = method_target._find_or_create_kek_objects - self.assertEqual(method_mock.call_count, 1) + self.assertEqual(1, method_mock.call_count) # Verify generating plugin and method where invoked. self._verify_generating_plugin_args( @@ -326,7 +326,7 @@ class WhenTestingStoreCrypto(TestSecretStoreBase): # Verify secret save was invoked. method_target = self.store_secret_and_datum_patcher.target method_mock = method_target._store_secret_and_datum - self.assertEqual(method_mock.call_count, 1) + self.assertEqual(1, method_mock.call_count) def test_generate_asymmetric_key_with_passphrase(self): """test asymmetric secret generation with passphrase.""" @@ -434,7 +434,7 @@ class WhenTestingStoreCrypto(TestSecretStoreBase): # Verify KEK objects finder was invoked. method_target = self.find_or_create_kek_objects_patcher.target method_mock = method_target._find_or_create_kek_objects - self.assertEqual(method_mock.call_count, 1) + self.assertEqual(1, method_mock.call_count) # Verify generating plugin and method where invoked. self._verify_generating_plugin_args( @@ -448,11 +448,11 @@ class WhenTestingStoreCrypto(TestSecretStoreBase): call_count = 3 method_target = self.store_secret_and_datum_patcher.target method_mock = method_target._store_secret_and_datum - self.assertEqual(method_mock.call_count, call_count) + self.assertEqual(call_count, method_mock.call_count) def _verify_generating_plugin_args(self, generate_mock, alg, bit_length): """Verify generating plugin and method where invoked.""" - self.assertEqual(generate_mock.call_count, 1) + self.assertEqual(1, generate_mock.call_count) args, kwargs = generate_mock.call_args test_generate_dto, test_kek_meta_dto, test_project_id = tuple(args) self.assertIsInstance(test_generate_dto, crypto.GenerateDTO) @@ -604,11 +604,11 @@ class WhenTestingStoreCryptoFindOrCreateKekObjects(TestSecretStoreBase): # Verify bind operations. self.assertEqual( - plugin_inst.bind_kek_metadata.call_count, 1) + 1, plugin_inst.bind_kek_metadata.call_count) self.assertEqual( - self.bind_completed_mock.call_count, 1) + 1, self.bind_completed_mock.call_count) self.assertEqual( - self.kek_repo.save.call_count, 1) + 1, self.kek_repo.save.call_count) args, kwargs = self.kek_repo.save.call_args kek_model = args[0] self.assertEqual(self.kek_meta_project_model, kek_model) @@ -627,7 +627,7 @@ class WhenTestingStoreCryptoFindOrCreateKekObjects(TestSecretStoreBase): def _verify_kek_repository_interactions(self, plugin_inst): """Verify the KEK repository interactions.""" self.assertEqual( - self.kek_repo.find_or_create_kek_datum.call_count, 1) + 1, self.kek_repo.find_or_create_kek_datum.call_count) args, kwargs = self.kek_repo.find_or_create_kek_datum.call_args test_project_model = args[0] test_full_plugin_name = args[1] @@ -683,12 +683,12 @@ class WhenTestingStoreCryptoStoreSecretAndDatum(TestSecretStoreBase): # Verify **not** these repository interactions. self.assertEqual( - self.secret_repo.create_from.call_count, 0) + 0, self.secret_repo.create_from.call_count) def _verify_secret_repository_interactions(self): """Verify the secret repository interactions.""" self.assertEqual( - self.secret_repo.create_from.call_count, 1) + 1, self.secret_repo.create_from.call_count) args, kwargs = self.secret_repo.create_from.call_args test_secret_model = args[0] self.assertEqual(self.secret_model, test_secret_model) @@ -696,7 +696,7 @@ class WhenTestingStoreCryptoStoreSecretAndDatum(TestSecretStoreBase): def _verify_encrypted_datum_repository_interactions(self): """Verify the encrypted datum repository interactions.""" self.assertEqual( - self.datum_repo.create_from.call_count, 1) + 1, self.datum_repo.create_from.call_count) args, kwargs = self.datum_repo.create_from.call_args test_datum_model = args[0] self.assertIsInstance(test_datum_model, models.EncryptedDatum) @@ -722,10 +722,10 @@ class WhenTestingStoreCryptoIndicateBindCompleted(TestSecretStoreBase): self.assertTrue(self.kek_meta_project_model.bind_completed) self.assertEqual( - kek_meta_dto.algorithm, self.kek_meta_project_model.algorithm) + self.kek_meta_project_model.algorithm, kek_meta_dto.algorithm) self.assertEqual( - kek_meta_dto.bit_length, self.kek_meta_project_model.bit_length) + self.kek_meta_project_model.bit_length, kek_meta_dto.bit_length) self.assertEqual( - kek_meta_dto.mode, self.kek_meta_project_model.mode) + self.kek_meta_project_model.mode, kek_meta_dto.mode) self.assertEqual( - kek_meta_dto.plugin_meta, self.kek_meta_project_model.plugin_meta) + self.kek_meta_project_model.plugin_meta, kek_meta_dto.plugin_meta) diff --git a/barbican/tests/plugin/test_symantec.py b/barbican/tests/plugin/test_symantec.py index 1139ae6d6..1b7b2bdac 100644 --- a/barbican/tests/plugin/test_symantec.py +++ b/barbican/tests/plugin/test_symantec.py @@ -66,7 +66,7 @@ class WhenTestingSymantecPlugin(utils.BaseTestCase): self.barbican_plugin_dto ) - self.assertEqual(result.status, "waiting for CA") + self.assertEqual("waiting for CA", result.status) def test_unsuccessful_certificate_request_can_retry(self): self.mock_create_order.return_value = (False, self.error_msg, True) @@ -81,7 +81,7 @@ class WhenTestingSymantecPlugin(utils.BaseTestCase): self.barbican_plugin_dto ) - self.assertEqual(result.status, "client data issue seen") + self.assertEqual("client data issue seen", result.status) def test_unsuccessful_certificate_request_no_retry(self): self.mock_create_order.return_value = (False, self.error_msg, False) @@ -96,7 +96,7 @@ class WhenTestingSymantecPlugin(utils.BaseTestCase): self.barbican_plugin_dto ) - self.assertEqual(result.status, "CA unavailable for request") + self.assertEqual("CA unavailable for request", result.status) def test_should_raise_unsupported_certificate_request(self): order_id = '1234'