python:tests: Use assertEqual() instead of assertEquals()

assertEquals() was removed in Python 3.12.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/samba_tool/gpo.py b/python/samba/tests/samba_tool/gpo.py
index f5adccb88a11e303a6291e4b555c0d4cfb846cbe..39363bc4f754bc5dedff6df2113edb12546ac50d 100644 (file)
--- a/python/samba/tests/samba_tool/gpo.py
+++ b/python/samba/tests/samba_tool/gpo.py
@@ -1805,8 +1805,8 @@ class GpoCmdTestCase(SambaToolCmdTest):
             self.assertIn('UserPolicy         : False', out,
                           'The test cse should not have User policy enabled')
             cse_ext = re.findall(r'^UniqueGUID\s+:\s+(.*)', out)
-            self.assertEquals(len(cse_ext), 1,
-                              'The test cse GUID was not found')
+            self.assertEqual(len(cse_ext), 1,
+                             'The test cse GUID was not found')
             cse_ext = cse_ext[0]
             self.assertTrue(check_guid(cse_ext),
                             'The test cse GUID was not formatted correctly')

diff --git a/python/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py b/python/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py
index 25c02d9ac2a87f260f84fcdc1fcceea6bd1daf09..1ceaf2d1320036fed8596b25e256ca5ab2901d73 100644 (file)
--- a/python/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py
+++ b/python/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py
@@ -219,8 +219,8 @@ class UserCmdCryptShaTestCaseGPG(UserCmdCryptShaTestCase):
         out = self._get_password("virtualCryptSHA256;rounds=2561," +
                                  "virtualCryptSHA512;rounds=5129",
                                  True)
-        self.assertEquals(sha256, _get_attribute(out, "virtualCryptSHA256"))
-        self.assertEquals(sha512, _get_attribute(out, "virtualCryptSHA512"))
+        self.assertEqual(sha256, _get_attribute(out, "virtualCryptSHA256"))
+        self.assertEqual(sha512, _get_attribute(out, "virtualCryptSHA512"))
 
         # The returned hashes should specify the correct number of rounds
         self.assertTrue(sha256.startswith("{CRYPT}$5$rounds=2561"))

diff --git a/python/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py b/python/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py
index 98619a43fae9d0a3b9b57af0eeb50ae7aa4de3c2..75a9fe573253c726f4a171962b938ca77f7c19d2 100644 (file)
--- a/python/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py
+++ b/python/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py
@@ -92,8 +92,8 @@ class UserCmdCryptShaTestCaseUserPassword(UserCmdCryptShaTestCase):
         sha512 = _get_attribute(out, "virtualCryptSHA512")
 
         out = self._get_password("virtualCryptSHA256,virtualCryptSHA512")
-        self.assertEquals(sha256, _get_attribute(out, "virtualCryptSHA256"))
-        self.assertEquals(sha512, _get_attribute(out, "virtualCryptSHA512"))
+        self.assertEqual(sha256, _get_attribute(out, "virtualCryptSHA256"))
+        self.assertEqual(sha512, _get_attribute(out, "virtualCryptSHA512"))
 
     # gpg decryption not enabled.
     # both virtual attributes specified, rounds specified
@@ -115,8 +115,8 @@ class UserCmdCryptShaTestCaseUserPassword(UserCmdCryptShaTestCase):
         sha512 = _get_attribute(out, "virtualCryptSHA512")
 
         out = self._get_password("virtualCryptSHA256,virtualCryptSHA512")
-        self.assertEquals(sha256, _get_attribute(out, "virtualCryptSHA256"))
-        self.assertEquals(sha512, _get_attribute(out, "virtualCryptSHA512"))
+        self.assertEqual(sha256, _get_attribute(out, "virtualCryptSHA256"))
+        self.assertEqual(sha512, _get_attribute(out, "virtualCryptSHA512"))
 
     # gpg decryption not enabled.
     # both virtual attributes specified, rounds specified
@@ -142,8 +142,8 @@ class UserCmdCryptShaTestCaseUserPassword(UserCmdCryptShaTestCase):
 
         out = self._get_password("virtualCryptSHA256;rounds=2561," +
                                  "virtualCryptSHA512;rounds=5129")
-        self.assertEquals(sha256, _get_attribute(out, "virtualCryptSHA256"))
-        self.assertEquals(sha512, _get_attribute(out, "virtualCryptSHA512"))
+        self.assertEqual(sha256, _get_attribute(out, "virtualCryptSHA256"))
+        self.assertEqual(sha512, _get_attribute(out, "virtualCryptSHA512"))
 
         # Number of rounds should match that specified
         self.assertTrue(sha256.startswith("{CRYPT}$5$rounds=2561"))
@@ -174,12 +174,12 @@ class UserCmdCryptShaTestCaseUserPassword(UserCmdCryptShaTestCase):
 
         out = self._get_password("virtualCryptSHA256;rounds=4000," +
                                  "virtualCryptSHA512;rounds=5000")
-        self.assertEquals(sha256, _get_attribute(out, "virtualCryptSHA256"))
-        self.assertEquals(sha512, _get_attribute(out, "virtualCryptSHA512"))
+        self.assertEqual(sha256, _get_attribute(out, "virtualCryptSHA256"))
+        self.assertEqual(sha512, _get_attribute(out, "virtualCryptSHA512"))
 
         # As the number of rounds did not match, should have returned the
         # first hash of the corresponding scheme
         out = self._get_password("virtualCryptSHA256," +
                                  "virtualCryptSHA512")
-        self.assertEquals(sha256, _get_attribute(out, "virtualCryptSHA256"))
-        self.assertEquals(sha512, _get_attribute(out, "virtualCryptSHA512"))
+        self.assertEqual(sha256, _get_attribute(out, "virtualCryptSHA256"))
+        self.assertEqual(sha512, _get_attribute(out, "virtualCryptSHA512"))