Skip to content

Commit f3c019a

Browse files
absurdfarcedkropachev
authored andcommitted
PYTHON-1389 Removing deprecated test aliases (datastax#1216)
1 parent 85aea8a commit f3c019a

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

tests/integration/standard/column_encryption/test_policies.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ def test_end_to_end_prepared(self):
5959
# A straight select from the database will now return the decrypted bits. We select both encrypted and unencrypted
6060
# values here to confirm that we don't interfere with regular processing of unencrypted vals.
6161
(encrypted,unencrypted) = session.execute("select encrypted, unencrypted from foo.bar where unencrypted = %s allow filtering", (expected,)).one()
62-
self.assertEquals(expected, encrypted)
63-
self.assertEquals(expected, unencrypted)
62+
self.assertEqual(expected, encrypted)
63+
self.assertEqual(expected, unencrypted)
6464

6565
# Confirm the same behaviour from a subsequent prepared statement as well
6666
prepared = session.prepare("select encrypted, unencrypted from foo.bar where unencrypted = ? allow filtering")
6767
(encrypted,unencrypted) = session.execute(prepared, [expected]).one()
68-
self.assertEquals(expected, encrypted)
69-
self.assertEquals(expected, unencrypted)
68+
self.assertEqual(expected, encrypted)
69+
self.assertEqual(expected, unencrypted)
7070

7171
def test_end_to_end_simple(self):
7272

@@ -87,14 +87,14 @@ def test_end_to_end_simple(self):
8787
# A straight select from the database will now return the decrypted bits. We select both encrypted and unencrypted
8888
# values here to confirm that we don't interfere with regular processing of unencrypted vals.
8989
(encrypted,unencrypted) = session.execute("select encrypted, unencrypted from foo.bar where unencrypted = %s allow filtering", (expected,)).one()
90-
self.assertEquals(expected, encrypted)
91-
self.assertEquals(expected, unencrypted)
90+
self.assertEqual(expected, encrypted)
91+
self.assertEqual(expected, unencrypted)
9292

9393
# Confirm the same behaviour from a subsequent prepared statement as well
9494
prepared = session.prepare("select encrypted, unencrypted from foo.bar where unencrypted = ? allow filtering")
9595
(encrypted,unencrypted) = session.execute(prepared, [expected]).one()
96-
self.assertEquals(expected, encrypted)
97-
self.assertEquals(expected, unencrypted)
96+
self.assertEqual(expected, encrypted)
97+
self.assertEqual(expected, unencrypted)
9898

9999
def test_end_to_end_different_cle_contexts_different_ivs(self):
100100
"""
@@ -136,8 +136,8 @@ def test_end_to_end_different_cle_contexts_different_ivs(self):
136136
cluster2 = TestCluster(column_encryption_policy=cl_policy2)
137137
session2 = cluster2.connect()
138138
(encrypted,unencrypted) = session2.execute("select encrypted, unencrypted from foo.bar where unencrypted = %s allow filtering", (expected,)).one()
139-
self.assertEquals(expected, encrypted)
140-
self.assertEquals(expected, unencrypted)
139+
self.assertEqual(expected, encrypted)
140+
self.assertEqual(expected, unencrypted)
141141

142142
def test_end_to_end_different_cle_contexts_different_policies(self):
143143
"""
@@ -162,10 +162,10 @@ def test_end_to_end_different_cle_contexts_different_policies(self):
162162
# A straight select from the database will now return the decrypted bits. We select both encrypted and unencrypted
163163
# values here to confirm that we don't interfere with regular processing of unencrypted vals.
164164
(encrypted,unencrypted) = session2.execute("select encrypted, unencrypted from foo.bar where unencrypted = %s allow filtering", (expected,)).one()
165-
self.assertEquals(cl_policy.encode_and_encrypt(col_desc, expected), encrypted)
166-
self.assertEquals(expected, unencrypted)
165+
self.assertEqual(cl_policy.encode_and_encrypt(col_desc, expected), encrypted)
166+
self.assertEqual(expected, unencrypted)
167167

168168
# Confirm the same behaviour from a subsequent prepared statement as well
169169
prepared = session2.prepare("select encrypted, unencrypted from foo.bar where unencrypted = ? allow filtering")
170170
(encrypted,unencrypted) = session2.execute(prepared, [expected]).one()
171-
self.assertEquals(cl_policy.encode_and_encrypt(col_desc, expected), encrypted)
171+
self.assertEqual(cl_policy.encode_and_encrypt(col_desc, expected), encrypted)

0 commit comments

Comments
 (0)