Description: Use assertEqual, not assertEquals Author: Thomas Goirand Forwarded: no Last-Update: 2024-12-20 --- python-pykmip-0.10.0.orig/kmip/tests/unit/core/messages/test_messages.py +++ python-pykmip-0.10.0/kmip/tests/unit/core/messages/test_messages.py @@ -431,7 +431,7 @@ class TestRequestMessage(TestCase): msg = "Bad batch items type: expected {0}, received {1}" self.assertIsInstance(batch_items, list, msg.format(list, type(batch_items))) - self.assertEquals(1, len(batch_items), + self.assertEqual(1, len(batch_items), self.msg.format('batch items', 'length', 1, len(batch_items))) @@ -479,7 +479,7 @@ class TestRequestMessage(TestCase): self.assertIsInstance(attributes, list, self.msg.format('attributes', 'type', list, type(attributes))) - self.assertEquals(3, len(attributes), + self.assertEqual(3, len(attributes), self.msg.format('attributes', 'length', 3, len(attributes))) @@ -494,7 +494,7 @@ class TestRequestMessage(TestCase): self.msg.format('attribute name', 'type', objects.Attribute.AttributeName, type(attribute_name))) - self.assertEquals('Cryptographic Algorithm', attribute_name.value, + self.assertEqual('Cryptographic Algorithm', attribute_name.value, self.msg.format('attribute name', 'value', 'Cryptographic Algorithm', attribute_name.value)) @@ -505,7 +505,7 @@ class TestRequestMessage(TestCase): self.assertIsInstance(attribute_value, exp_type, self.msg.format('attribute value', 'type', exp_type, rcv_type)) - self.assertEquals(attribute_value.value, + self.assertEqual(attribute_value.value, enums.CryptographicAlgorithm.AES, self.msg.format('cryptographic algorithm', 'value', enums.CryptographicAlgorithm.AES, @@ -522,7 +522,7 @@ class TestRequestMessage(TestCase): self.msg.format('attribute name', 'type', objects.Attribute.AttributeName, type(attribute_name))) - self.assertEquals('Cryptographic Length', attribute_name.value, + self.assertEqual('Cryptographic Length', attribute_name.value, self.msg.format('attribute name', 'value', 'Cryptographic Length', attribute_name.value)) @@ -533,7 +533,7 @@ class TestRequestMessage(TestCase): self.assertIsInstance(attribute_value, exp_type, self.msg.format('attribute value', 'type', exp_type, rcv_type)) - self.assertEquals(attribute_value.value, 128, + self.assertEqual(attribute_value.value, 128, self.msg.format('cryptographic length', 'value', 128, attribute_value.value)) @@ -548,7 +548,7 @@ class TestRequestMessage(TestCase): self.msg.format('attribute name', 'type', objects.Attribute.AttributeName, type(attribute_name))) - self.assertEquals('Cryptographic Usage Mask', attribute_name.value, + self.assertEqual('Cryptographic Usage Mask', attribute_name.value, self.msg.format('attribute name', 'value', 'Cryptographic Usage Mask', attribute_name.value)) @@ -562,7 +562,7 @@ class TestRequestMessage(TestCase): flag_encrypt = CryptographicUsageMask.ENCRYPT flag_decrypt = CryptographicUsageMask.DECRYPT exp_value = flag_encrypt.value | flag_decrypt.value - self.assertEquals(attribute_value.value, exp_value, + self.assertEqual(attribute_value.value, exp_value, self.msg.format('cryptographic usage mask', 'value', exp_value, attribute_value.value)) @@ -662,7 +662,7 @@ class TestRequestMessage(TestCase): msg = "Bad batch items type: expected {0}, received {1}" self.assertIsInstance(batch_items, list, msg.format(list, type(batch_items))) - self.assertEquals(1, len(batch_items), + self.assertEqual(1, len(batch_items), self.msg.format('batch items', 'length', 1, len(batch_items))) @@ -780,7 +780,7 @@ class TestRequestMessage(TestCase): msg = "Bad batch items type: expected {0}, received {1}" self.assertIsInstance(batch_items, list, msg.format(list, type(batch_items))) - self.assertEquals(1, len(batch_items), + self.assertEqual(1, len(batch_items), self.msg.format('batch items', 'length', 1, len(batch_items))) @@ -899,7 +899,7 @@ class TestRequestMessage(TestCase): msg = "Bad batch items type: expected {0}, received {1}" self.assertIsInstance(batch_items, list, msg.format(list, type(batch_items))) - self.assertEquals(1, len(batch_items), + self.assertEqual(1, len(batch_items), self.msg.format('batch items', 'length', 1, len(batch_items))) @@ -1113,7 +1113,7 @@ class TestRequestMessage(TestCase): batch_items = request_message.batch_items msg = "Bad batch items type: expected {0}, received {1}" - self.assertEquals(1, len(batch_items), + self.assertEqual(1, len(batch_items), self.msg.format('batch items', 'length', 1, len(batch_items))) @@ -1164,7 +1164,7 @@ class TestRequestMessage(TestCase): self.msg.format('attribute name', 'type', objects.Attribute.AttributeName, type(attribute_name))) - self.assertEquals('Object Type', attribute_name.value, + self.assertEqual('Object Type', attribute_name.value, self.msg.format('attribute name', 'value', 'Object Type', attribute_name.value)) @@ -1175,7 +1175,7 @@ class TestRequestMessage(TestCase): self.assertIsInstance(attribute_value, exp_type, self.msg.format('attribute value', 'type', exp_type, rcv_type)) - self.assertEquals( + self.assertEqual( attribute_value.value, enums.ObjectType.SYMMETRIC_KEY, self.msg.format( @@ -1193,7 +1193,7 @@ class TestRequestMessage(TestCase): self.msg.format('attribute name', 'type', objects.Attribute.AttributeName, type(attribute_name))) - self.assertEquals('Name', attribute_name.value, + self.assertEqual('Name', attribute_name.value, self.msg.format('attribute name', 'value', 'Name', attribute_name.value)) @@ -1204,7 +1204,7 @@ class TestRequestMessage(TestCase): self.assertIsInstance(attribute_value, exp_type, self.msg.format('attribute value', 'type', exp_type, rcv_type)) - self.assertEquals('Key1', attribute_value.name_value.value, + self.assertEqual('Key1', attribute_value.name_value.value, self.msg.format('name value', 'value', 'Key1', attribute_value.name_value.value)) @@ -1260,7 +1260,7 @@ class TestRequestMessage(TestCase): msg = "Bad batch items type: expected {0}, received {1}" self.assertIsInstance(batch_items, list, msg.format(list, type(batch_items))) - self.assertEquals(1, len(batch_items), + self.assertEqual(1, len(batch_items), self.msg.format('batch items', 'length', 1, len(batch_items))) @@ -1310,7 +1310,7 @@ class TestRequestMessage(TestCase): msg.format(enums.CryptographicAlgorithm, type(cryptographic_algorithm))) msg = "Bad cryptographic algorithm value: expected {0}, received {1}" - self.assertEquals(cryptographic_algorithm, + self.assertEqual(cryptographic_algorithm, enums.CryptographicAlgorithm.HMAC_SHA512, msg.format(cryptographic_algorithm, enums.CryptographicAlgorithm.HMAC_SHA512)) @@ -1922,7 +1922,7 @@ class TestResponseMessage(TestCase): msg = "Bad batch items type: expected {0}, received {1}" self.assertIsInstance(batch_items, list, msg.format(list, type(batch_items))) - self.assertEquals(1, len(batch_items), + self.assertEqual(1, len(batch_items), self.msg.format('batch items', 'length', 1, len(batch_items))) @@ -2065,7 +2065,7 @@ class TestResponseMessage(TestCase): msg = "Bad batch items type: expected {0}, received {1}" self.assertIsInstance(batch_items, list, msg.format(list, type(batch_items))) - self.assertEquals(1, len(batch_items), + self.assertEqual(1, len(batch_items), self.msg.format('batch items', 'length', 1, len(batch_items))) --- python-pykmip-0.10.0.orig/kmip/tests/unit/core/test_enums.py +++ python-pykmip-0.10.0/kmip/tests/unit/core/test_enums.py @@ -34,7 +34,7 @@ class TestOrderedEnum(testtools.TestCase enums.KMIPVersion.KMIP_1_0 >= enums.KMIPVersion.KMIP_2_0 ) - self.assertEquals( + self.assertEqual( NotImplemented, enums.KMIPVersion.KMIP_2_0.__ge__(enums.WrappingMethod.ENCRYPT) ) @@ -47,7 +47,7 @@ class TestOrderedEnum(testtools.TestCase enums.KMIPVersion.KMIP_1_1 > enums.KMIPVersion.KMIP_1_3 ) - self.assertEquals( + self.assertEqual( NotImplemented, enums.KMIPVersion.KMIP_2_0.__gt__(enums.WrappingMethod.ENCRYPT) ) @@ -60,7 +60,7 @@ class TestOrderedEnum(testtools.TestCase enums.KMIPVersion.KMIP_1_4 <= enums.KMIPVersion.KMIP_1_3 ) - self.assertEquals( + self.assertEqual( NotImplemented, enums.KMIPVersion.KMIP_2_0.__le__(enums.WrappingMethod.ENCRYPT) ) @@ -73,7 +73,7 @@ class TestOrderedEnum(testtools.TestCase enums.KMIPVersion.KMIP_2_0 < enums.KMIPVersion.KMIP_1_3 ) - self.assertEquals( + self.assertEqual( NotImplemented, enums.KMIPVersion.KMIP_2_0.__lt__(enums.WrappingMethod.ENCRYPT) ) --- python-pykmip-0.10.0.orig/kmip/tests/unit/pie/objects/test_opaque_object.py +++ python-pykmip-0.10.0/kmip/tests/unit/pie/objects/test_opaque_object.py @@ -253,11 +253,11 @@ class TestOpaqueObject(testtools.TestCas self.bytes_a, enums.OpaqueDataType.NONE, name=expected_names[0]) obj.names.append(expected_names[1]) obj.names.append(expected_names[2]) - self.assertEquals(3, obj.name_index) + self.assertEqual(3, obj.name_index) expected_mo_names = list() for i, name in enumerate(expected_names): expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_mo_names, obj._names) + self.assertEqual(expected_mo_names, obj._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -269,7 +269,7 @@ class TestOpaqueObject(testtools.TestCas ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_name(self): """ @@ -284,7 +284,7 @@ class TestOpaqueObject(testtools.TestCas obj.names.append(names[1]) obj.names.append(names[2]) obj.names.pop(remove_index) - self.assertEquals(3, obj.name_index) + self.assertEqual(3, obj.name_index) expected_names = list() expected_mo_names = list() @@ -292,8 +292,8 @@ class TestOpaqueObject(testtools.TestCas if i != remove_index: expected_names.append(name) expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_names, obj.names) - self.assertEquals(expected_mo_names, obj._names) + self.assertEqual(expected_names, obj.names) + self.assertEqual(expected_mo_names, obj._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -305,8 +305,8 @@ class TestOpaqueObject(testtools.TestCas ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_and_add_name(self): """ @@ -323,7 +323,7 @@ class TestOpaqueObject(testtools.TestCas obj.names.pop() obj.names.pop() obj.names.append('dog') - self.assertEquals(4, obj.name_index) + self.assertEqual(4, obj.name_index) expected_names = ['bowser', 'dog'] expected_mo_names = list() @@ -331,8 +331,8 @@ class TestOpaqueObject(testtools.TestCas 0)) expected_mo_names.append(sqltypes.ManagedObjectName(expected_names[1], 3)) - self.assertEquals(expected_names, obj.names) - self.assertEquals(expected_mo_names, obj._names) + self.assertEqual(expected_names, obj.names) + self.assertEqual(expected_mo_names, obj._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -344,8 +344,8 @@ class TestOpaqueObject(testtools.TestCas ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_add_name(self): """ @@ -385,8 +385,8 @@ class TestOpaqueObject(testtools.TestCas ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_name(self): """ @@ -426,8 +426,8 @@ class TestOpaqueObject(testtools.TestCas ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_and_add_name(self): """ @@ -470,5 +470,5 @@ class TestOpaqueObject(testtools.TestCas ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) --- python-pykmip-0.10.0.orig/kmip/tests/unit/pie/objects/test_private_key.py +++ python-pykmip-0.10.0/kmip/tests/unit/pie/objects/test_private_key.py @@ -597,11 +597,11 @@ class TestPrivateKey(testtools.TestCase) enums.KeyFormatType.PKCS_1, name=expected_names[0]) key.names.append(expected_names[1]) key.names.append(expected_names[2]) - self.assertEquals(3, key.name_index) + self.assertEqual(3, key.name_index) expected_mo_names = list() for i, name in enumerate(expected_names): expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_mo_names, key._names) + self.assertEqual(expected_mo_names, key._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -613,7 +613,7 @@ class TestPrivateKey(testtools.TestCase) ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_name(self): """ @@ -629,7 +629,7 @@ class TestPrivateKey(testtools.TestCase) key.names.append(names[1]) key.names.append(names[2]) key.names.pop(remove_index) - self.assertEquals(3, key.name_index) + self.assertEqual(3, key.name_index) expected_names = list() expected_mo_names = list() @@ -637,8 +637,8 @@ class TestPrivateKey(testtools.TestCase) if i != remove_index: expected_names.append(name) expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_names, key.names) - self.assertEquals(expected_mo_names, key._names) + self.assertEqual(expected_names, key.names) + self.assertEqual(expected_mo_names, key._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -650,8 +650,8 @@ class TestPrivateKey(testtools.TestCase) ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_and_add_name(self): """ @@ -669,7 +669,7 @@ class TestPrivateKey(testtools.TestCase) key.names.pop() key.names.pop() key.names.append('dog') - self.assertEquals(4, key.name_index) + self.assertEqual(4, key.name_index) expected_names = ['bowser', 'dog'] expected_mo_names = list() @@ -677,8 +677,8 @@ class TestPrivateKey(testtools.TestCase) 0)) expected_mo_names.append(sqltypes.ManagedObjectName(expected_names[1], 3)) - self.assertEquals(expected_names, key.names) - self.assertEquals(expected_mo_names, key._names) + self.assertEqual(expected_names, key.names) + self.assertEqual(expected_mo_names, key._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -690,8 +690,8 @@ class TestPrivateKey(testtools.TestCase) ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_add_name(self): """ @@ -732,8 +732,8 @@ class TestPrivateKey(testtools.TestCase) ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_name(self): """ @@ -774,8 +774,8 @@ class TestPrivateKey(testtools.TestCase) ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_and_add_name(self): """ @@ -819,5 +819,5 @@ class TestPrivateKey(testtools.TestCase) ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) --- python-pykmip-0.10.0.orig/kmip/tests/unit/pie/objects/test_public_key.py +++ python-pykmip-0.10.0/kmip/tests/unit/pie/objects/test_public_key.py @@ -495,11 +495,11 @@ class TestPublicKey(testtools.TestCase): enums.KeyFormatType.PKCS_1, name=expected_names[0]) key.names.append(expected_names[1]) key.names.append(expected_names[2]) - self.assertEquals(3, key.name_index) + self.assertEqual(3, key.name_index) expected_mo_names = list() for i, name in enumerate(expected_names): expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_mo_names, key._names) + self.assertEqual(expected_mo_names, key._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -511,7 +511,7 @@ class TestPublicKey(testtools.TestCase): ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_name(self): """ @@ -527,7 +527,7 @@ class TestPublicKey(testtools.TestCase): key.names.append(names[1]) key.names.append(names[2]) key.names.pop(remove_index) - self.assertEquals(3, key.name_index) + self.assertEqual(3, key.name_index) expected_names = list() expected_mo_names = list() @@ -535,8 +535,8 @@ class TestPublicKey(testtools.TestCase): if i != remove_index: expected_names.append(name) expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_names, key.names) - self.assertEquals(expected_mo_names, key._names) + self.assertEqual(expected_names, key.names) + self.assertEqual(expected_mo_names, key._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -548,8 +548,8 @@ class TestPublicKey(testtools.TestCase): ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_and_add_name(self): """ @@ -567,7 +567,7 @@ class TestPublicKey(testtools.TestCase): key.names.pop() key.names.pop() key.names.append('dog') - self.assertEquals(4, key.name_index) + self.assertEqual(4, key.name_index) expected_names = ['bowser', 'dog'] expected_mo_names = list() @@ -575,8 +575,8 @@ class TestPublicKey(testtools.TestCase): 0)) expected_mo_names.append(sqltypes.ManagedObjectName(expected_names[1], 3)) - self.assertEquals(expected_names, key.names) - self.assertEquals(expected_mo_names, key._names) + self.assertEqual(expected_names, key.names) + self.assertEqual(expected_mo_names, key._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -588,8 +588,8 @@ class TestPublicKey(testtools.TestCase): ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_add_name(self): """ @@ -630,8 +630,8 @@ class TestPublicKey(testtools.TestCase): ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_name(self): """ @@ -672,8 +672,8 @@ class TestPublicKey(testtools.TestCase): ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_and_add_name(self): """ @@ -717,5 +717,5 @@ class TestPublicKey(testtools.TestCase): ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) --- python-pykmip-0.10.0.orig/kmip/tests/unit/pie/objects/test_secret_data.py +++ python-pykmip-0.10.0/kmip/tests/unit/pie/objects/test_secret_data.py @@ -272,11 +272,11 @@ class TestSecretData(testtools.TestCase) name=expected_names[0]) obj.names.append(expected_names[1]) obj.names.append(expected_names[2]) - self.assertEquals(3, obj.name_index) + self.assertEqual(3, obj.name_index) expected_mo_names = list() for i, name in enumerate(expected_names): expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_mo_names, obj._names) + self.assertEqual(expected_mo_names, obj._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -288,7 +288,7 @@ class TestSecretData(testtools.TestCase) ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_name(self): """ @@ -303,7 +303,7 @@ class TestSecretData(testtools.TestCase) obj.names.append(names[1]) obj.names.append(names[2]) obj.names.pop(remove_index) - self.assertEquals(3, obj.name_index) + self.assertEqual(3, obj.name_index) expected_names = list() expected_mo_names = list() @@ -311,8 +311,8 @@ class TestSecretData(testtools.TestCase) if i != remove_index: expected_names.append(name) expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_names, obj.names) - self.assertEquals(expected_mo_names, obj._names) + self.assertEqual(expected_names, obj.names) + self.assertEqual(expected_mo_names, obj._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -324,8 +324,8 @@ class TestSecretData(testtools.TestCase) ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_and_add_name(self): """ @@ -342,7 +342,7 @@ class TestSecretData(testtools.TestCase) obj.names.pop() obj.names.pop() obj.names.append('dog') - self.assertEquals(4, obj.name_index) + self.assertEqual(4, obj.name_index) expected_names = ['bowser', 'dog'] expected_mo_names = list() @@ -350,8 +350,8 @@ class TestSecretData(testtools.TestCase) 0)) expected_mo_names.append(sqltypes.ManagedObjectName(expected_names[1], 3)) - self.assertEquals(expected_names, obj.names) - self.assertEquals(expected_mo_names, obj._names) + self.assertEqual(expected_names, obj.names) + self.assertEqual(expected_mo_names, obj._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -363,8 +363,8 @@ class TestSecretData(testtools.TestCase) ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_add_name(self): """ @@ -404,8 +404,8 @@ class TestSecretData(testtools.TestCase) ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_name(self): """ @@ -445,8 +445,8 @@ class TestSecretData(testtools.TestCase) ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_and_add_name(self): """ @@ -489,5 +489,5 @@ class TestSecretData(testtools.TestCase) ManagedObject.unique_identifier == obj.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) --- python-pykmip-0.10.0.orig/kmip/tests/unit/pie/objects/test_symmetric_key.py +++ python-pykmip-0.10.0/kmip/tests/unit/pie/objects/test_symmetric_key.py @@ -442,11 +442,11 @@ class TestSymmetricKey(testtools.TestCas name=expected_names[0]) key.names.append(expected_names[1]) key.names.append(expected_names[2]) - self.assertEquals(3, key.name_index) + self.assertEqual(3, key.name_index) expected_mo_names = list() for i, name in enumerate(expected_names): expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_mo_names, key._names) + self.assertEqual(expected_mo_names, key._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -458,7 +458,7 @@ class TestSymmetricKey(testtools.TestCas ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_name(self): """ @@ -474,7 +474,7 @@ class TestSymmetricKey(testtools.TestCas key.names.append(names[1]) key.names.append(names[2]) key.names.pop(remove_index) - self.assertEquals(3, key.name_index) + self.assertEqual(3, key.name_index) expected_names = list() expected_mo_names = list() @@ -482,8 +482,8 @@ class TestSymmetricKey(testtools.TestCas if i != remove_index: expected_names.append(name) expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_names, key.names) - self.assertEquals(expected_mo_names, key._names) + self.assertEqual(expected_names, key.names) + self.assertEqual(expected_mo_names, key._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -495,8 +495,8 @@ class TestSymmetricKey(testtools.TestCas ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_and_add_name(self): """ @@ -514,7 +514,7 @@ class TestSymmetricKey(testtools.TestCas key.names.pop() key.names.pop() key.names.append('dog') - self.assertEquals(4, key.name_index) + self.assertEqual(4, key.name_index) expected_names = ['bowser', 'dog'] expected_mo_names = list() @@ -522,8 +522,8 @@ class TestSymmetricKey(testtools.TestCas 0)) expected_mo_names.append(sqltypes.ManagedObjectName(expected_names[1], 3)) - self.assertEquals(expected_names, key.names) - self.assertEquals(expected_mo_names, key._names) + self.assertEqual(expected_names, key.names) + self.assertEqual(expected_mo_names, key._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -535,8 +535,8 @@ class TestSymmetricKey(testtools.TestCas ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_add_name(self): """ @@ -577,8 +577,8 @@ class TestSymmetricKey(testtools.TestCas ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_name(self): """ @@ -619,8 +619,8 @@ class TestSymmetricKey(testtools.TestCas ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_and_add_name(self): """ @@ -664,5 +664,5 @@ class TestSymmetricKey(testtools.TestCas ManagedObject.unique_identifier == key.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) --- python-pykmip-0.10.0.orig/kmip/tests/unit/pie/objects/test_x509_certificate.py +++ python-pykmip-0.10.0/kmip/tests/unit/pie/objects/test_x509_certificate.py @@ -348,11 +348,11 @@ class TestX509Certificate(testtools.Test cert = X509Certificate(self.bytes_a, name=expected_names[0]) cert.names.append(expected_names[1]) cert.names.append(expected_names[2]) - self.assertEquals(3, cert.name_index) + self.assertEqual(3, cert.name_index) expected_mo_names = list() for i, name in enumerate(expected_names): expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_mo_names, cert._names) + self.assertEqual(expected_mo_names, cert._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -364,7 +364,7 @@ class TestX509Certificate(testtools.Test ManagedObject.unique_identifier == cert.unique_identifier ).one() session.commit() - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_name(self): """ @@ -378,7 +378,7 @@ class TestX509Certificate(testtools.Test cert.names.append(names[1]) cert.names.append(names[2]) cert.names.pop(remove_index) - self.assertEquals(3, cert.name_index) + self.assertEqual(3, cert.name_index) expected_names = list() expected_mo_names = list() @@ -386,8 +386,8 @@ class TestX509Certificate(testtools.Test if i != remove_index: expected_names.append(name) expected_mo_names.append(sqltypes.ManagedObjectName(name, i)) - self.assertEquals(expected_names, cert.names) - self.assertEquals(expected_mo_names, cert._names) + self.assertEqual(expected_names, cert.names) + self.assertEqual(expected_mo_names, cert._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -399,8 +399,8 @@ class TestX509Certificate(testtools.Test ManagedObject.unique_identifier == cert.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_remove_and_add_name(self): """ @@ -416,7 +416,7 @@ class TestX509Certificate(testtools.Test cert.names.pop() cert.names.pop() cert.names.append('dog') - self.assertEquals(4, cert.name_index) + self.assertEqual(4, cert.name_index) expected_names = ['bowser', 'dog'] expected_mo_names = list() @@ -424,8 +424,8 @@ class TestX509Certificate(testtools.Test 0)) expected_mo_names.append(sqltypes.ManagedObjectName(expected_names[1], 3)) - self.assertEquals(expected_names, cert.names) - self.assertEquals(expected_mo_names, cert._names) + self.assertEqual(expected_names, cert.names) + self.assertEqual(expected_mo_names, cert._names) Session = sessionmaker(bind=self.engine, expire_on_commit=False) session = Session() @@ -437,8 +437,8 @@ class TestX509Certificate(testtools.Test ManagedObject.unique_identifier == cert.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_add_name(self): """ @@ -477,8 +477,8 @@ class TestX509Certificate(testtools.Test ManagedObject.unique_identifier == cert.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_name(self): """ @@ -517,8 +517,8 @@ class TestX509Certificate(testtools.Test ManagedObject.unique_identifier == cert.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names) def test_update_with_remove_and_add_name(self): """ @@ -560,5 +560,5 @@ class TestX509Certificate(testtools.Test ManagedObject.unique_identifier == cert.unique_identifier ).one() session.commit() - self.assertEquals(expected_names, get_obj.names) - self.assertEquals(expected_mo_names, get_obj._names) + self.assertEqual(expected_names, get_obj.names) + self.assertEqual(expected_mo_names, get_obj._names)