pytests: heed assertEquals deprecation warning en-masse

[samba.git] / python / samba / tests / password_hash_fl2008.py

diff --git a/python/samba/tests/password_hash_fl2008.py b/python/samba/tests/password_hash_fl2008.py
index 685c73edaf294a37a6348215f7b1b670b54116fb..a43ac3f815b608f5436d9738390358a4566647f7 100644 (file)
--- a/python/samba/tests/password_hash_fl2008.py
+++ b/python/samba/tests/password_hash_fl2008.py
@@ -48,22 +48,22 @@ class PassWordHashFl2008Tests(PassWordHashTests):
         # Check that we got all the expected supplemental credentials
         # And they are in the expected order.
         size = len(sc.sub.packages)
-        self.assertEquals(4, size)
+        self.assertEqual(4, size)
         (pos, package) = get_package(sc, "Primary:Kerberos-Newer-Keys")
-        self.assertEquals(1, pos)
-        self.assertEquals("Primary:Kerberos-Newer-Keys", package.name)
+        self.assertEqual(1, pos)
+        self.assertEqual("Primary:Kerberos-Newer-Keys", package.name)
 
         (pos, package) = get_package(sc, "Primary:Kerberos")
-        self.assertEquals(2, pos)
-        self.assertEquals("Primary:Kerberos", package.name)
+        self.assertEqual(2, pos)
+        self.assertEqual("Primary:Kerberos", package.name)
 
         (pos, package) = get_package(sc, "Packages")
-        self.assertEquals(3, pos)
-        self.assertEquals("Packages", package.name)
+        self.assertEqual(3, pos)
+        self.assertEqual("Packages", package.name)
 
         (pos, package) = get_package(sc, "Primary:WDigest")
-        self.assertEquals(4, pos)
-        self.assertEquals("Primary:WDigest", package.name)
+        self.assertEqual(4, pos)
+        self.assertEqual("Primary:WDigest", package.name)
 
         # Check that the WDigest values are correct.
         #
@@ -80,27 +80,27 @@ class PassWordHashFl2008Tests(PassWordHashTests):
         # Check that we got all the expected supplemental credentials
         # And they are in the expected order.
         size = len(sc.sub.packages)
-        self.assertEquals(5, size)
+        self.assertEqual(5, size)
 
         (pos, package) = get_package(sc, "Primary:Kerberos-Newer-Keys")
-        self.assertEquals(1, pos)
-        self.assertEquals("Primary:Kerberos-Newer-Keys", package.name)
+        self.assertEqual(1, pos)
+        self.assertEqual("Primary:Kerberos-Newer-Keys", package.name)
 
         (pos, package) = get_package(sc, "Primary:Kerberos")
-        self.assertEquals(2, pos)
-        self.assertEquals("Primary:Kerberos", package.name)
+        self.assertEqual(2, pos)
+        self.assertEqual("Primary:Kerberos", package.name)
 
         (pos, wp_package) = get_package(sc, "Primary:WDigest")
-        self.assertEquals(3, pos)
-        self.assertEquals("Primary:WDigest", wp_package.name)
+        self.assertEqual(3, pos)
+        self.assertEqual("Primary:WDigest", wp_package.name)
 
         (pos, package) = get_package(sc, "Packages")
-        self.assertEquals(4, pos)
-        self.assertEquals("Packages", package.name)
+        self.assertEqual(4, pos)
+        self.assertEqual("Packages", package.name)
 
         (pos, up_package) = get_package(sc, "Primary:userPassword")
-        self.assertEquals(5, pos)
-        self.assertEquals("Primary:userPassword", up_package.name)
+        self.assertEqual(5, pos)
+        self.assertEqual("Primary:userPassword", up_package.name)
 
         # Check that the WDigest values are correct.
         #
@@ -123,26 +123,26 @@ class PassWordHashFl2008Tests(PassWordHashTests):
         # Check that we got all the expected supplemental credentials
         # And they are in the expected order.
         size = len(sc.sub.packages)
-        self.assertEquals(5, size)
+        self.assertEqual(5, size)
         (pos, package) = get_package(sc, "Primary:Kerberos-Newer-Keys")
-        self.assertEquals(1, pos)
-        self.assertEquals("Primary:Kerberos-Newer-Keys", package.name)
+        self.assertEqual(1, pos)
+        self.assertEqual("Primary:Kerberos-Newer-Keys", package.name)
 
         (pos, package) = get_package(sc, "Primary:Kerberos")
-        self.assertEquals(2, pos)
-        self.assertEquals("Primary:Kerberos", package.name)
+        self.assertEqual(2, pos)
+        self.assertEqual("Primary:Kerberos", package.name)
 
         (pos, wd_package) = get_package(sc, "Primary:WDigest")
-        self.assertEquals(3, pos)
-        self.assertEquals("Primary:WDigest", wd_package.name)
+        self.assertEqual(3, pos)
+        self.assertEqual("Primary:WDigest", wd_package.name)
 
         (pos, package) = get_package(sc, "Packages")
-        self.assertEquals(4, pos)
-        self.assertEquals("Packages", package.name)
+        self.assertEqual(4, pos)
+        self.assertEqual("Packages", package.name)
 
         (pos, ct_package) = get_package(sc, "Primary:CLEARTEXT")
-        self.assertEquals(5, pos)
-        self.assertEquals("Primary:CLEARTEXT", ct_package.name)
+        self.assertEqual(5, pos)
+        self.assertEqual("Primary:CLEARTEXT", ct_package.name)
 
         # Check that the WDigest values are correct.
         #
@@ -153,7 +153,7 @@ class PassWordHashFl2008Tests(PassWordHashTests):
         # Check the clear text  value is correct.
         ct = ndr_unpack(drsblobs.package_PrimaryCLEARTEXTBlob,
                         binascii.a2b_hex(ct_package.data))
-        self.assertEquals(USER_PASS.encode('utf-16-le'), ct.cleartext)
+        self.assertEqual(USER_PASS.encode('utf-16-le'), ct.cleartext)
 
     def test_userPassword_cleartext_sha256(self):
         self.add_user(clear_text=True,
@@ -165,31 +165,31 @@ class PassWordHashFl2008Tests(PassWordHashTests):
         # Check that we got all the expected supplemental credentials
         # And they are in the expected order.
         size = len(sc.sub.packages)
-        self.assertEquals(6, size)
+        self.assertEqual(6, size)
 
         (pos, package) = get_package(sc, "Primary:Kerberos-Newer-Keys")
-        self.assertEquals(1, pos)
-        self.assertEquals("Primary:Kerberos-Newer-Keys", package.name)
+        self.assertEqual(1, pos)
+        self.assertEqual("Primary:Kerberos-Newer-Keys", package.name)
 
         (pos, package) = get_package(sc, "Primary:Kerberos")
-        self.assertEquals(2, pos)
-        self.assertEquals("Primary:Kerberos", package.name)
+        self.assertEqual(2, pos)
+        self.assertEqual("Primary:Kerberos", package.name)
 
         (pos, wd_package) = get_package(sc, "Primary:WDigest")
-        self.assertEquals(3, pos)
-        self.assertEquals("Primary:WDigest", wd_package.name)
+        self.assertEqual(3, pos)
+        self.assertEqual("Primary:WDigest", wd_package.name)
 
         (pos, ct_package) = get_package(sc, "Primary:CLEARTEXT")
-        self.assertEquals(4, pos)
-        self.assertEquals("Primary:CLEARTEXT", ct_package.name)
+        self.assertEqual(4, pos)
+        self.assertEqual("Primary:CLEARTEXT", ct_package.name)
 
         (pos, package) = get_package(sc, "Packages")
-        self.assertEquals(5, pos)
-        self.assertEquals("Packages", package.name)
+        self.assertEqual(5, pos)
+        self.assertEqual("Packages", package.name)
 
         (pos, up_package) = get_package(sc, "Primary:userPassword")
-        self.assertEquals(6, pos)
-        self.assertEquals("Primary:userPassword", up_package.name)
+        self.assertEqual(6, pos)
+        self.assertEqual("Primary:userPassword", up_package.name)
 
         # Check that the WDigest values are correct.
         #
@@ -200,7 +200,7 @@ class PassWordHashFl2008Tests(PassWordHashTests):
         # Check the clear text  value is correct.
         ct = ndr_unpack(drsblobs.package_PrimaryCLEARTEXTBlob,
                         binascii.a2b_hex(ct_package.data))
-        self.assertEquals(USER_PASS.encode('utf-16-le'), ct.cleartext)
+        self.assertEqual(USER_PASS.encode('utf-16-le'), ct.cleartext)
 
         # Check that the userPassword hashes are computed correctly
         #