sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-23 00:23:53 +03:00
Code Activity

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

Browse Source 
assertEquals() was removed in Python 3.12.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton
2023-10-02 13:34:05 +13:00
committed by Andrew Bartlett
parent 08dbb35e7e
commit 2fa838d439
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/samba/tests/samba_tool/gpo.py
View File

@@ -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')

4
python/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py
View File

@@ -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"))

20
python/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py
View File

@@ -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"))