diff options
Diffstat (limited to 'functionaltests/client')
6 files changed, 30 insertions, 30 deletions
diff --git a/functionaltests/client/v1/functional/test_acl.py b/functionaltests/client/v1/functional/test_acl.py index d9f8fc8..d9ad6f2 100644 --- a/functionaltests/client/v1/functional/test_acl.py +++ b/functionaltests/client/v1/functional/test_acl.py @@ -24,7 +24,7 @@ from barbicanclient import exceptions create_secret_defaults_data = { "name": "AES key", - "expiration": "2020-02-28T19:14:44.180394", + "expiration": "2030-02-28T19:14:44.180394", "algorithm": "aes", "bit_length": 256, "mode": "cbc", diff --git a/functionaltests/client/v1/functional/test_containers.py b/functionaltests/client/v1/functional/test_containers.py index 64b9cdc..bdcd5a3 100644 --- a/functionaltests/client/v1/functional/test_containers.py +++ b/functionaltests/client/v1/functional/test_containers.py @@ -22,11 +22,11 @@ from barbicanclient import exceptions create_secret_defaults_data = { "name": "AES key", - "expiration": "2020-02-28T19:14:44.180394", + "expiration": "2030-02-28T19:14:44.180394", "algorithm": "aes", "bit_length": 256, "mode": "cbc", - "payload": "gF6+lLoF3ohA9aPRpt+6bQ==", + "payload": b"gF6+lLoF3ohA9aPRpt+6bQ==", "payload_content_type": "application/octet-stream", "payload_content_encoding": "base64", } @@ -48,7 +48,7 @@ create_container_empty_data = { accepted_str_values = { 'alphanumeric': ['a2j3j6ll9'], 'punctuation': ['~!@#$%^&*()_+`-={}[]|:;<>,.?'], - 'len_255': [str(bytearray().zfill(255))], + 'len_255': ['a' * 255], 'uuid': ['54262d9d-4bc7-4821-8df0-dc2ca8e112bb'], 'empty': [''] } @@ -139,7 +139,7 @@ class GenericContainersTestCase(BaseContainersTestCase): e = self.assertRaises(ValueError, self.barbicanclient.containers.get, url) - self.assertEqual('Container incorrectly specified.', e.message) + self.assertEqual('Container incorrectly specified.', str(e)) @testcase.attr('negative') def test_get_non_existent_container_valid_uuid(self): @@ -171,7 +171,7 @@ class GenericContainersTestCase(BaseContainersTestCase): e = self.assertRaises(ValueError, self.barbicanclient.containers.get, url) - self.assertEqual('Container incorrectly specified.', e.message) + self.assertEqual('Container incorrectly specified.', str(e)) @testcase.attr('negative') def test_delete_non_existent_container_valid_uuid(self): @@ -296,7 +296,7 @@ class RSAContainersTestCase(BaseContainersTestCase): self.barbicanclient.containers.create_rsa, **incorrect_names_rsa_container) - self.assertIn('got an unexpected keyword argument', e.message) + self.assertIn('got an unexpected keyword argument', str(e)) @testcase.attr('negative') def test_create_rsa_no_public_key(self): diff --git a/functionaltests/client/v1/functional/test_orders.py b/functionaltests/client/v1/functional/test_orders.py index 4dc2444..3fd34e1 100644 --- a/functionaltests/client/v1/functional/test_orders.py +++ b/functionaltests/client/v1/functional/test_orders.py @@ -164,7 +164,7 @@ class OrdersTestCase(base.TestCase): e = self.assertRaises(ValueError, self.barbicanclient.orders.get, ref) # verify that the order get failed - self.assertEqual('Order incorrectly specified.', e.message) + self.assertEqual('Order incorrectly specified.', str(e)) @testcase.attr('negative') def test_get_order_defaults_that_doesnt_exist_valid_uuid(self): @@ -252,7 +252,7 @@ class OrdersTestCase(base.TestCase): self.assertEqual(order.bit_length, order_resp.bit_length) @utils.parameterized_dataset({ - 'negative_maxint': [-sys.maxint], + 'negative_maxsize': [-sys.maxsize], 'negative_7': [-7], 'negative_1': [-1], '0': [0], diff --git a/functionaltests/client/v1/functional/test_secrets.py b/functionaltests/client/v1/functional/test_secrets.py index 8d9fcf0..fae6c42 100644 --- a/functionaltests/client/v1/functional/test_secrets.py +++ b/functionaltests/client/v1/functional/test_secrets.py @@ -28,11 +28,11 @@ from testtools import testcase secret_create_defaults_data = { "name": "AES key", - "expiration": "2020-02-28T19:14:44.180394", + "expiration": "2030-02-28T19:14:44.180394", "algorithm": "aes", "bit_length": 256, "mode": "cbc", - "payload": "gF6+lLoF3ohA9aPRpt+6bQ==" + "payload": b"gF6+lLoF3ohA9aPRpt+6bQ==" } secret_create_nones_data = { @@ -41,7 +41,7 @@ secret_create_nones_data = { "algorithm": None, "bit_length": None, "mode": None, - "payload": "gF6+lLoF3ohA9aPRpt+6bQ==", + "payload": b"gF6+lLoF3ohA9aPRpt+6bQ==", "payload_content_type": "application/octet-stream", "payload_content_encoding": "base64", } @@ -52,7 +52,7 @@ secret_create_emptystrings_data = { "algorithm": '', "bit_length": '', "mode": '', - "payload": '', + "payload": b'', "payload_content_type": '', "payload_content_encoding": '', } @@ -145,7 +145,7 @@ class SecretsTestCase(base.TestCase): e = self.assertRaises(ValueError, self.barbicanclient.secrets.delete, url) - self.assertEqual('Secret incorrectly specified.', e.message) + self.assertEqual('Secret incorrectly specified.', str(e)) @testcase.attr('negative') def test_secret_delete_doesnt_exist_valid_uuid_format(self): @@ -179,7 +179,7 @@ class SecretsTestCase(base.TestCase): e = self.assertRaises(ValueError, self.barbicanclient.secrets.get, url, 'text/plain') - self.assertIn("Secret incorrectly specified", e.message) + self.assertIn("Secret incorrectly specified", str(e)) @testcase.attr('negative') def test_secret_create_defaults_expiration_passed(self): @@ -309,8 +309,8 @@ class SecretsTestCase(base.TestCase): 'symmetric': ['symmetric', 'aes', 128, - ('\x00\x01\x02\x03\x04\x05\x06\x07' - '\x00\x01\x02\x03\x04\x05\x06\x07')], + (b'\x00\x01\x02\x03\x04\x05\x06\x07' + b'\x00\x01\x02\x03\x04\x05\x06\x07')], 'private': ['private', 'rsa', 2048, @@ -390,7 +390,7 @@ class SecretsTestCase(base.TestCase): 'str_type': ['not-an-int'], 'empty': [''], 'blank': [' '], - 'negative_maxint': [-sys.maxint], + 'negative_maxsize': [-sys.maxsize], 'negative_one': [-1], 'zero': [0] }) @@ -481,7 +481,7 @@ class SecretsTestCase(base.TestCase): resp.payload ) else: - self.assertEqual(secret.payload, str(resp.payload)) + self.assertEqual(secret.payload, resp.payload.encode('utf-8')) @utils.parameterized_dataset({ 'large_string_content_type_and_encoding': { @@ -703,7 +703,7 @@ class SecretsTestCase(base.TestCase): 'alphanumeric': ['1f34ds'], 'punctuation': ['~!@#$%^&*()_+`-={}[]|:;<>,.?'], 'uuid': ['54262d9d-4bc7-4821-8df0-dc2ca8e112bb'], - 'len_255': [str(bytearray().zfill(255))], + 'len_255': ['a' * 255], 'empty': [''], 'null': [None] }) diff --git a/functionaltests/client/v1/smoke/test_containers.py b/functionaltests/client/v1/smoke/test_containers.py index 584df47..28792b7 100644 --- a/functionaltests/client/v1/smoke/test_containers.py +++ b/functionaltests/client/v1/smoke/test_containers.py @@ -20,11 +20,11 @@ from testtools import testcase create_secret_defaults_data = { "name": "AES key", - "expiration": "2020-02-28T19:14:44.180394", + "expiration": "2030-02-28T19:14:44.180394", "algorithm": "aes", "bit_length": 256, "mode": "cbc", - "payload": "gF6+lLoF3ohA9aPRpt+6bQ==", + "payload": b"gF6+lLoF3ohA9aPRpt+6bQ==", "payload_content_type": "application/octet-stream", "payload_content_encoding": "base64", } @@ -114,7 +114,7 @@ class ContainersTestCase(base.TestCase): @utils.parameterized_dataset({ 'alphanumeric': ['a2j3j6ll9'], 'punctuation': ['~!@#$%^&*()_+`-={}[]|:;<>,.?'], - 'len_255': [str(bytearray().zfill(255))], + 'len_255': ['a' * 255], 'uuid': ['54262d9d-4bc7-4821-8df0-dc2ca8e112bb'], 'empty': [''] }) @@ -137,7 +137,7 @@ class ContainersTestCase(base.TestCase): self.assertEqual(container_ref, container_resp.container_ref) get_resp_secret_refs = [] - for name, ref in container_resp.secret_refs.iteritems(): + for name, ref in container_resp.secret_refs.items(): get_resp_secret_refs.append(str(ref)) # Verify the secret refs in the response @@ -164,7 +164,7 @@ class ContainersTestCase(base.TestCase): self.assertEqual(container_ref, container_resp.container_ref) get_resp_secret_refs = [] - for name, ref in container_resp.secret_refs.iteritems(): + for name, ref in container_resp.secret_refs.items(): get_resp_secret_refs.append(str(ref)) # Verify the secret refs in the response self.assertEqual(3, len(container_resp.secret_refs)) diff --git a/functionaltests/client/v1/smoke/test_secrets.py b/functionaltests/client/v1/smoke/test_secrets.py index 3f11740..0b9e358 100644 --- a/functionaltests/client/v1/smoke/test_secrets.py +++ b/functionaltests/client/v1/smoke/test_secrets.py @@ -21,11 +21,11 @@ from testtools import testcase secret_create_defaults_data = { "name": "AES key", - "expiration": "2020-02-28T19:14:44.180394", + "expiration": "2030-02-28T19:14:44.180394", "algorithm": "aes", "bit_length": 256, "mode": "cbc", - "payload": "gF6+lLoF3ohA9aPRpt+6bQ==" + "payload": b"gF6+lLoF3ohA9aPRpt+6bQ==" } secret_create_nones_data = { @@ -34,7 +34,7 @@ secret_create_nones_data = { "algorithm": None, "bit_length": None, "mode": None, - "payload": "gF6+lLoF3ohA9aPRpt+6bQ==", + "payload": b"gF6+lLoF3ohA9aPRpt+6bQ==", "payload_content_type": "application/octet-stream", "payload_content_encoding": "base64", } @@ -65,8 +65,8 @@ class SecretsTestCase(base.TestCase): 'symmetric': ['symmetric', 'aes', 128, - ('\x00\x01\x02\x03\x04\x05\x06\x07' - '\x00\x01\x02\x03\x04\x05\x06\x07')], + (b'\x00\x01\x02\x03\x04\x05\x06\x07' + b'\x00\x01\x02\x03\x04\x05\x06\x07')], 'private': ['private', 'rsa', 2048, |