diff options
Diffstat (limited to 'python/samba/tests/samba_tool')
19 files changed, 182 insertions, 182 deletions
diff --git a/python/samba/tests/samba_tool/computer.py b/python/samba/tests/samba_tool/computer.py index 9912fd408a4..3110a3b04e8 100644 --- a/python/samba/tests/samba_tool/computer.py +++ b/python/samba/tests/samba_tool/computer.py @@ -78,10 +78,10 @@ class ComputerCmdTestCase(SambaToolCmdTest): expectedsamaccountname = computer["name"] if not computer["name"].endswith('$'): expectedsamaccountname = "%s$" % computer["name"] - self.assertEquals("%s" % found.get("name"), expectedname) - self.assertEquals("%s" % found.get("sAMAccountName"), + self.assertEqual("%s" % found.get("name"), expectedname) + self.assertEqual("%s" % found.get("sAMAccountName"), expectedsamaccountname) - self.assertEquals("%s" % found.get("description"), + self.assertEqual("%s" % found.get("description"), computer["description"]) def tearDown(self): @@ -155,7 +155,7 @@ class ComputerCmdTestCase(SambaToolCmdTest): "--description=%s" % computer["description"]) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") self.assertIn("Computer '%s' created successfully" % computer["name"], out) @@ -165,10 +165,10 @@ class ComputerCmdTestCase(SambaToolCmdTest): expectedsamaccountname = computer["name"] if not computer["name"].endswith('$'): expectedsamaccountname = "%s$" % computer["name"] - self.assertEquals("%s" % found.get("name"), expectedname) - self.assertEquals("%s" % found.get("sAMAccountName"), + self.assertEqual("%s" % found.get("name"), expectedname) + self.assertEqual("%s" % found.get("sAMAccountName"), expectedsamaccountname) - self.assertEquals("%s" % found.get("description"), + self.assertEqual("%s" % found.get("description"), computer["description"]) def test_list(self): @@ -243,7 +243,7 @@ class ComputerCmdTestCase(SambaToolCmdTest): self.assertCmdSuccess(result, out, err, "Failed to move computer '%s'" % computer["name"]) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") self.assertIn('Moved computer "%s"' % computer["name"], out) found = self._find_computer(computer["name"]) @@ -255,7 +255,7 @@ class ComputerCmdTestCase(SambaToolCmdTest): "CN=%s,OU=%s,%s" % (computername, parentou["name"], self.samdb.domain_dn())) - self.assertEquals(found.get("dn"), newexpecteddn, + self.assertEqual(found.get("dn"), newexpecteddn, "Moved computer '%s' does not exist" % computer["name"]) diff --git a/python/samba/tests/samba_tool/contact.py b/python/samba/tests/samba_tool/contact.py index f02e3603e5d..8b34e20b249 100644 --- a/python/samba/tests/samba_tool/contact.py +++ b/python/samba/tests/samba_tool/contact.py @@ -78,8 +78,8 @@ class ContactCmdTestCase(SambaToolCmdTest): self.assertIsNotNone(found) contactname = contact["expectedname"] - self.assertEquals("%s" % found.get("name"), contactname) - self.assertEquals("%s" % found.get("description"), + self.assertEqual("%s" % found.get("name"), contactname) + self.assertEqual("%s" % found.get("description"), contact["description"]) def tearDown(self): @@ -122,15 +122,15 @@ class ContactCmdTestCase(SambaToolCmdTest): (result, out, err) = self._create_contact(contact, ou="OU=testOU") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") self.assertIn("Contact '%s' created successfully" % contact["expectedname"], out) found = self._find_contact(contact["expectedname"]) contactname = contact["expectedname"] - self.assertEquals("%s" % found.get("name"), contactname) - self.assertEquals("%s" % found.get("description"), + self.assertEqual("%s" % found.get("name"), contactname) + self.assertEqual("%s" % found.get("description"), contact["description"]) # try to delete all the contacts we just created, by DN @@ -160,15 +160,15 @@ class ContactCmdTestCase(SambaToolCmdTest): (result, out, err) = self._create_contact(contact) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") self.assertIn("Contact '%s' created successfully" % contact["expectedname"], out) found = self._find_contact(contact["expectedname"]) contactname = contact["expectedname"] - self.assertEquals("%s" % found.get("name"), contactname) - self.assertEquals("%s" % found.get("description"), + self.assertEqual("%s" % found.get("name"), contactname) + self.assertEqual("%s" % found.get("description"), contact["description"]) def test_list(self): @@ -237,7 +237,7 @@ class ContactCmdTestCase(SambaToolCmdTest): self.assertCmdSuccess(result, out, err, "Failed to move contact '%s'" % contact["expectedname"]) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") self.assertIn('Moved contact "%s"' % contact["expectedname"], out) found = self._find_contact(contact["expectedname"]) @@ -250,7 +250,7 @@ class ContactCmdTestCase(SambaToolCmdTest): (contactname, parentou["name"], self.samdb.domain_dn())) - self.assertEquals(found.get("dn"), newexpecteddn, + self.assertEqual(found.get("dn"), newexpecteddn, "Moved contact '%s' does not exist" % contact["expectedname"]) diff --git a/python/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py b/python/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py index ae78784a04d..71521b6a07f 100644 --- a/python/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py +++ b/python/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py @@ -83,12 +83,12 @@ class DrsCloneDcDataLmdbSizeTestCase(SambaToolCmdTest): # 8Gb is used def test_default(self): (result, out, err) = self.clone() - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(8 * 1024 * 1024 * 1024) def test_64Mb(self): (result, out, err) = self.clone("64Mb") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(64 * 1024 * 1024) def test_no_unit_suffix(self): diff --git a/python/samba/tests/samba_tool/dsacl.py b/python/samba/tests/samba_tool/dsacl.py index 4a2ee56009c..66c662f7a3b 100644 --- a/python/samba/tests/samba_tool/dsacl.py +++ b/python/samba/tests/samba_tool/dsacl.py @@ -43,7 +43,7 @@ class DSaclSetSddlTestCase(SambaToolCmdTest): """Tests if a sddl string can be added 'the normal way'""" (result, out, err) = self.runsubcmd("dsacl", "set","--objectdn=%s" % self.dn, "--sddl=%s" % self.sddl) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") #extract only the two sddl strings from samba-tool output acl_list=re.findall('.*descriptor for.*:\n(.*?)\n',out) self.assertNotEqual(acl_list[0], acl_list[1], "new and old SDDL string differ") @@ -54,7 +54,7 @@ class DSaclSetSddlTestCase(SambaToolCmdTest): (result, out, err) = self.runsubcmd("dsacl", "get", "--objectdn=%s" % self.dn) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") #extract only the two sddl strings from samba-tool output acl_list_get=re.findall('^descriptor for.*:\n(.*?)\n', out) @@ -62,7 +62,7 @@ class DSaclSetSddlTestCase(SambaToolCmdTest): "--objectdn=%s" % self.dn, "--sddl=%s" % self.sddl) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") #extract only the two sddl strings from samba-tool output acl_list_old=re.findall('old descriptor for.*:\n(.*?)\n', out) self.assertEqual(acl_list_old, acl_list_get, @@ -73,7 +73,7 @@ class DSaclSetSddlTestCase(SambaToolCmdTest): (result, out, err) = self.runsubcmd("dsacl", "get", "--objectdn=%s" % self.dn) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") #extract only the two sddl strings from samba-tool output acl_list_get2=re.findall('^descriptor for.*:\n(.*?)\n', out) self.assertEqual(acl_list, acl_list_get2, @@ -83,7 +83,7 @@ class DSaclSetSddlTestCase(SambaToolCmdTest): """Tests if we can add multiple, different sddl strings at the same time""" (result, out, err) = self.runsubcmd("dsacl", "set","--objectdn=%s" % self.dn, "--sddl=%s" % self.sddl_multi) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") #extract only the two sddl strings from samba-tool output acl_list=re.findall('.*descriptor for.*:\n(.*?)\n',out) for ace in re.findall('\(.*?\)',self.sddl_multi): @@ -92,33 +92,33 @@ class DSaclSetSddlTestCase(SambaToolCmdTest): def test_duplicatesddl(self): """Tests if an already existing sddl string can be added causing duplicate entry""" acl_list = self._double_sddl_check(self.sddl,self.sddl) - self.assertEquals(acl_list[0],acl_list[1]) + self.assertEqual(acl_list[0],acl_list[1]) def test_casesensitivesddl(self): """Tests if an already existing sddl string can be added in different cases causing duplicate entry""" acl_list = self._double_sddl_check(self.sddl_lc,self.sddl_uc) - self.assertEquals(acl_list[0],acl_list[1]) + self.assertEqual(acl_list[0],acl_list[1]) def test_sidsddl(self): """Tests if an already existing sddl string can be added with SID instead of SDDL SIDString causing duplicate entry""" acl_list = self._double_sddl_check(self.sddl,self.sddl_sid) - self.assertEquals(acl_list[0],acl_list[1]) + self.assertEqual(acl_list[0],acl_list[1]) def test_twosddl(self): """Tests if an already existing sddl string can be added by using it twice/in combination with non existing sddl string causing duplicate entry""" acl_list = self._double_sddl_check(self.sddl,self.sddl + self.sddl) - self.assertEquals(acl_list[0],acl_list[1]) + self.assertEqual(acl_list[0],acl_list[1]) def _double_sddl_check(self,sddl1,sddl2): """Adds two sddl strings and checks if there was an ace change after the second adding""" (result, out, err) = self.runsubcmd("dsacl", "set","--objectdn=%s" % self.dn, "--sddl=%s" % sddl1) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") acl_list = re.findall('.*descriptor for.*:\n(.*?)\n',out) self.assertMatch(acl_list[1], sddl1, "new SDDL string should be contained within second sddl output - is not") #add sddl2 (result, out, err) = self.runsubcmd("dsacl", "set","--objectdn=%s" % self.dn, "--sddl=%s" % sddl2) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") acl_list = re.findall('.*descriptor for.*:\n(.*?)\n',out) return acl_list diff --git a/python/samba/tests/samba_tool/forest.py b/python/samba/tests/samba_tool/forest.py index 8817636bd63..f5cb3c03126 100644 --- a/python/samba/tests/samba_tool/forest.py +++ b/python/samba/tests/samba_tool/forest.py @@ -50,7 +50,7 @@ class ForestCmdTestCase(SambaToolCmdTest): os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("dsheuristics: <NO VALUE>", out) def test_modify_dsheuristics(self): @@ -63,5 +63,5 @@ class ForestCmdTestCase(SambaToolCmdTest): os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("set dsheuristics: 0000002", out) diff --git a/python/samba/tests/samba_tool/fsmo.py b/python/samba/tests/samba_tool/fsmo.py index 674cc0e32dc..29fe7bfe08a 100644 --- a/python/samba/tests/samba_tool/fsmo.py +++ b/python/samba/tests/samba_tool/fsmo.py @@ -28,7 +28,7 @@ class FsmoCmdTestCase(SambaToolCmdTest): (result, out, err) = self.runsubcmd("fsmo", "show") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") # Check that the output is sensible samdb = self.getSamDB("-H", "ldap://%s" % os.environ["SERVER"], diff --git a/python/samba/tests/samba_tool/group.py b/python/samba/tests/samba_tool/group.py index c5c9cdb1d34..f85c945d32c 100644 --- a/python/samba/tests/samba_tool/group.py +++ b/python/samba/tests/samba_tool/group.py @@ -53,7 +53,7 @@ class GroupCmdTestCase(SambaToolCmdTest): (result, out, err) = group["createGroupFn"](group) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") if 'unix' in group["name"]: self.assertIn("Modified Group '%s' successfully" @@ -67,8 +67,8 @@ class GroupCmdTestCase(SambaToolCmdTest): self.assertIsNotNone(found) - self.assertEquals("%s" % found.get("name"), group["name"]) - self.assertEquals("%s" % found.get("description"), group["description"]) + self.assertEqual("%s" % found.get("name"), group["name"]) + self.assertEqual("%s" % found.get("description"), group["description"]) def tearDown(self): super(GroupCmdTestCase, self).tearDown() @@ -103,12 +103,12 @@ class GroupCmdTestCase(SambaToolCmdTest): os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") self.assertIn("Added group %s" % group["name"], out) found = self._find_group(group["name"]) - self.assertEquals("%s" % found.get("samaccountname"), + self.assertEqual("%s" % found.get("samaccountname"), "%s" % group["name"]) def test_list(self): @@ -263,7 +263,7 @@ class GroupCmdTestCase(SambaToolCmdTest): full_ou_dn = str(self.samdb.normalize_dn_in_domain("OU=movetest")) (result, out, err) = self.runsubcmd("ou", "create", full_ou_dn) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") self.assertIn('Created ou "%s"' % full_ou_dn, out) for group in self.groups: @@ -298,7 +298,7 @@ class GroupCmdTestCase(SambaToolCmdTest): "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("dn: CN=Domain Users,CN=Users,DC=addom,DC=samba,DC=example,DC=com", out) def _randomGroup(self, base={}): @@ -347,15 +347,15 @@ class GroupCmdTestCase(SambaToolCmdTest): its template """ found = self._find_group(group["name"]) - self.assertEquals("%s" % found.get("name"), group["name"]) - self.assertEquals("%s" % found.get("description"), group["description"]) + self.assertEqual("%s" % found.get("name"), group["name"]) + self.assertEqual("%s" % found.get("description"), group["description"]) def _check_posix_group(self, group): """ check if a posix_group from SamDB has the same attributes as its template """ found = self._find_group(group["name"]) - self.assertEquals("%s" % found.get("gidNumber"), "%s" % + self.assertEqual("%s" % found.get("gidNumber"), "%s" % group["gidNumber"]) self._check_group(group) @@ -364,7 +364,7 @@ class GroupCmdTestCase(SambaToolCmdTest): template """ found = self._find_group(group["name"]) - self.assertEquals("%s" % found.get("gidNumber"), "%s" % + self.assertEqual("%s" % found.get("gidNumber"), "%s" % group["gidNumber"]) self._check_group(group) diff --git a/python/samba/tests/samba_tool/join_lmdb_size.py b/python/samba/tests/samba_tool/join_lmdb_size.py index 2b68f2a48d8..e410d5fba23 100644 --- a/python/samba/tests/samba_tool/join_lmdb_size.py +++ b/python/samba/tests/samba_tool/join_lmdb_size.py @@ -92,7 +92,7 @@ class JoinLmdbSizeTestCase(SambaToolCmdTest): # 8Gb is used def test_join_as_dc_default(self): (result, out, err) = self.join(role="DC") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(8 * 1024 * 1024 * 1024) self.assertFalse(self.is_rodc()) @@ -100,7 +100,7 @@ class JoinLmdbSizeTestCase(SambaToolCmdTest): # Join as an DC with the lmdb backend size set to 1Gb def test_join_as_dc(self): (result, out, err) = self.join("1Gb", "DC") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(1 * 1024 * 1024 * 1024) self.assertFalse(self.is_rodc()) @@ -108,7 +108,7 @@ class JoinLmdbSizeTestCase(SambaToolCmdTest): # Join as an RODC with the lmdb backend size set to 128Mb def test_join_as_rodc(self): (result, out, err) = self.join("128Mb", "RODC") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(128 * 1024 * 1024) self.assertTrue(self.is_rodc()) @@ -116,7 +116,7 @@ class JoinLmdbSizeTestCase(SambaToolCmdTest): # Join as an RODC with --backend-store-size def test_join_as_rodc_default(self): (result, out, err) = self.join(role="RODC") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(8 * 1024 * 1024 * 1024) self.assertTrue(self.is_rodc()) diff --git a/python/samba/tests/samba_tool/ntacl.py b/python/samba/tests/samba_tool/ntacl.py index ee166764b6a..c9a14ec0ec8 100644 --- a/python/samba/tests/samba_tool/ntacl.py +++ b/python/samba/tests/samba_tool/ntacl.py @@ -32,7 +32,7 @@ class NtACLCmdSysvolTestCase(SambaToolCmdTest): (result, out, err) = self.runsubcmd("ntacl", "sysvolreset", "--use-ntvfs") self.assertCmdSuccess(result, out, err) - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(out, "", "Shouldn't be any output messages") self.assertIn("Please note that POSIX permissions have NOT been changed, only the stored NT ACL", err) def test_s3fs(self): @@ -40,34 +40,34 @@ class NtACLCmdSysvolTestCase(SambaToolCmdTest): "--use-s3fs") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(err, "", "Shouldn't be any error messages") + self.assertEqual(out, "", "Shouldn't be any output messages") def test_ntvfs_check(self): (result, out, err) = self.runsubcmd("ntacl", "sysvolreset", "--use-ntvfs") self.assertCmdSuccess(result, out, err) - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(out, "", "Shouldn't be any output messages") self.assertIn("Please note that POSIX permissions have NOT been changed, only the stored NT ACL", err) # Now check they were set correctly (result, out, err) = self.runsubcmd("ntacl", "sysvolcheck") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(err, "", "Shouldn't be any error messages") + self.assertEqual(out, "", "Shouldn't be any output messages") def test_s3fs_check(self): (result, out, err) = self.runsubcmd("ntacl", "sysvolreset", "--use-s3fs") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(err, "", "Shouldn't be any error messages") + self.assertEqual(out, "", "Shouldn't be any output messages") # Now check they were set correctly (result, out, err) = self.runsubcmd("ntacl", "sysvolcheck") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(err, "", "Shouldn't be any error messages") + self.assertEqual(out, "", "Shouldn't be any output messages") class NtACLCmdGetSetTestCase(SambaToolCmdTest): @@ -83,7 +83,7 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest): (result, out, err) = self.runsubcmd("ntacl", "set", self.acl, tempf, "--use-ntvfs") self.assertCmdSuccess(result, out, err) - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(out, "", "Shouldn't be any output messages") self.assertIn("Please note that POSIX permissions have NOT been changed, only the stored NT ACL", err) def test_s3fs(self): @@ -95,8 +95,8 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest): "--use-s3fs") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(err, "", "Shouldn't be any error messages") + self.assertEqual(out, "", "Shouldn't be any output messages") def test_ntvfs_check(self): path = os.environ['SELFTEST_PREFIX'] @@ -106,15 +106,15 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest): (result, out, err) = self.runsubcmd("ntacl", "set", self.acl, tempf, "--use-ntvfs") self.assertCmdSuccess(result, out, err) - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(out, "", "Shouldn't be any output messages") self.assertIn("Please note that POSIX permissions have NOT been changed, only the stored NT ACL", err) # Now check they were set correctly (result, out, err) = self.runsubcmd("ntacl", "get", tempf, "--use-ntvfs", "--as-sddl") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") - self.assertEquals(self.acl + "\n", out, "Output should be the ACL") + self.assertEqual(err, "", "Shouldn't be any error messages") + self.assertEqual(self.acl + "\n", out, "Output should be the ACL") def test_s3fs_check(self): path = os.environ['SELFTEST_PREFIX'] @@ -124,15 +124,15 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest): (result, out, err) = self.runsubcmd("ntacl", "set", self.acl, tempf, "--use-s3fs") self.assertCmdSuccess(result, out, err) - self.assertEquals(out, "", "Shouldn't be any output messages") - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(out, "", "Shouldn't be any output messages") + self.assertEqual(err, "", "Shouldn't be any error messages") # Now check they were set correctly (result, out, err) = self.runsubcmd("ntacl", "get", tempf, "--use-s3fs", "--as-sddl") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") - self.assertEquals(self.acl + "\n", out, "Output should be the ACL") + self.assertEqual(err, "", "Shouldn't be any error messages") + self.assertEqual(self.acl + "\n", out, "Output should be the ACL") class NtACLCmdChangedomsidTestCase(SambaToolCmdTest): """Tests for samba-tool ntacl changedomsid subcommand""" @@ -156,7 +156,7 @@ class NtACLCmdChangedomsidTestCase(SambaToolCmdTest): tempf, "--use-ntvfs") self.assertCmdSuccess(result, out, err) - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(out, "", "Shouldn't be any output messages") self.assertIn("Please note that POSIX permissions have NOT been " "changed, only the stored NT ACL", err) @@ -167,7 +167,7 @@ class NtACLCmdChangedomsidTestCase(SambaToolCmdTest): tempf, "--use-ntvfs") self.assertCmdSuccess(result, out, err) - self.assertEquals(out, "", "Shouldn't be any output messages") + self.assertEqual(out, "", "Shouldn't be any output messages") self.assertIn("Please note that POSIX permissions have NOT been " "changed, only the stored NT ACL.", err) @@ -178,8 +178,8 @@ class NtACLCmdChangedomsidTestCase(SambaToolCmdTest): "--use-ntvfs", "--as-sddl") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") - self.assertEquals(self.new_acl + "\n", out, "Output should be the ACL") + self.assertEqual(err, "", "Shouldn't be any error messages") + self.assertEqual(self.new_acl + "\n", out, "Output should be the ACL") def test_s3fs_check(self): path = os.environ['SELFTEST_PREFIX'] @@ -196,8 +196,8 @@ class NtACLCmdChangedomsidTestCase(SambaToolCmdTest): "--use-s3fs", "--service=sysvol") self.assertCmdSuccess(result, out, err) - self.assertEquals(out, "", "Shouldn't be any output messages") - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(out, "", "Shouldn't be any output messages") + self.assertEqual(err, "", "Shouldn't be any error messages") (result, out, err) = self.runsubcmd("ntacl", "changedomsid", @@ -207,8 +207,8 @@ class NtACLCmdChangedomsidTestCase(SambaToolCmdTest): "--use-s3fs", "--service=sysvol") self.assertCmdSuccess(result, out, err) - self.assertEquals(out, "", "Shouldn't be any output messages") - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(out, "", "Shouldn't be any output messages") + self.assertEqual(err, "", "Shouldn't be any error messages") # Now check they were set correctly (result, out, err) = self.runsubcmd("ntacl", @@ -218,5 +218,5 @@ class NtACLCmdChangedomsidTestCase(SambaToolCmdTest): "--as-sddl", "--service=sysvol") self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") - self.assertEquals(self.new_acl + "\n", out, "Output should be the ACL") + self.assertEqual(err, "", "Shouldn't be any error messages") + self.assertEqual(self.new_acl + "\n", out, "Output should be the ACL") diff --git a/python/samba/tests/samba_tool/ou.py b/python/samba/tests/samba_tool/ou.py index 9a6ccfe226a..54fad3c0161 100644 --- a/python/samba/tests/samba_tool/ou.py +++ b/python/samba/tests/samba_tool/ou.py @@ -44,7 +44,7 @@ class OUCmdTestCase(SambaToolCmdTest): (result, out, err) = self._create_ou(ou) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") full_ou_dn = self.samdb.normalize_dn_in_domain("OU=%s" % ou["name"]) self.assertIn('Created ou "%s"' % full_ou_dn, out) @@ -52,8 +52,8 @@ class OUCmdTestCase(SambaToolCmdTest): self.assertIsNotNone(found) - self.assertEquals("%s" % found.get("name"), ou["name"]) - self.assertEquals("%s" % found.get("description"), + self.assertEqual("%s" % found.get("name"), ou["name"]) + self.assertEqual("%s" % found.get("description"), ou["description"]) def tearDown(self): @@ -91,13 +91,13 @@ class OUCmdTestCase(SambaToolCmdTest): "--description=%s" % ou["description"]) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") full_ou_dn = self.samdb.normalize_dn_in_domain("OU=%s" % ou["name"]) self.assertIn('Created ou "%s"' % full_ou_dn, out) found = self._find_ou(ou["name"]) - self.assertEquals("%s" % found.get("ou"), + self.assertEqual("%s" % found.get("ou"), "%s" % ou["name"]) # try to delete all the ous we just created (with full dn) @@ -118,13 +118,13 @@ class OUCmdTestCase(SambaToolCmdTest): "--description=%s" % ou["description"]) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") full_ou_dn = self.samdb.normalize_dn_in_domain("OU=%s" % ou["name"]) self.assertIn('Created ou "%s"' % full_ou_dn, out) found = self._find_ou(ou["name"]) - self.assertEquals("%s" % found.get("ou"), + self.assertEqual("%s" % found.get("ou"), "%s" % ou["name"]) def test_list(self): @@ -199,7 +199,7 @@ class OUCmdTestCase(SambaToolCmdTest): "OU=%s" % parentou["name"]) self.assertCmdSuccess(result, out, err, "Failed to move ou '%s'" % ou["name"]) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") full_ou_dn = self.samdb.normalize_dn_in_domain("OU=%s" % ou["name"]) self.assertIn('Moved ou "%s"' % full_ou_dn, out) @@ -211,7 +211,7 @@ class OUCmdTestCase(SambaToolCmdTest): "OU=%s,OU=%s,%s" % (ou["name"], parentou["name"], self.samdb.domain_dn())) - self.assertEquals(found.get("dn"), newexpecteddn, + self.assertEqual(found.get("dn"), newexpecteddn, "Moved ou '%s' does not exist" % ou["name"]) @@ -232,7 +232,7 @@ class OUCmdTestCase(SambaToolCmdTest): "--full-dn") self.assertCmdSuccess(result, out, err, "Failed to list ou's objects") - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") objlist = self.samdb.search(base=self.samdb.domain_dn(), scope=ldb.SCOPE_ONELEVEL, @@ -248,7 +248,7 @@ class OUCmdTestCase(SambaToolCmdTest): "--full-dn") self.assertCmdSuccess(result, out, err, "Failed to list ous") - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") filter = "(objectClass=organizationalUnit)" objlist = self.samdb.search(base=self.samdb.domain_dn(), diff --git a/python/samba/tests/samba_tool/passwordsettings.py b/python/samba/tests/samba_tool/passwordsettings.py index 43264b64608..4d83d346717 100644 --- a/python/samba/tests/samba_tool/passwordsettings.py +++ b/python/samba/tests/samba_tool/passwordsettings.py @@ -56,7 +56,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): 'msDS-LockoutObservationWindow', 'msDS-LockoutThreshold', 'msDS-LockoutDuration'] res = self.ldb.search(dn, scope=ldb.SCOPE_BASE, attrs=pso_attrs) - self.assertEquals(len(res), 1, "PSO lookup failed") + self.assertEqual(len(res), 1, "PSO lookup failed") # convert types in the PSO-settings to what the search returns, i.e. # boolean --> string, seconds --> timestamps in -100 nanosecond units @@ -68,23 +68,23 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): max_age = -int(pso.password_age_max * (1e7)) # check the PSO's settings match the search results - self.assertEquals(str(res[0]['msDS-PasswordComplexityEnabled'][0]), + self.assertEqual(str(res[0]['msDS-PasswordComplexityEnabled'][0]), complexity_str) plaintext_res = res[0]['msDS-PasswordReversibleEncryptionEnabled'][0] - self.assertEquals(str(plaintext_res), plaintext_str) - self.assertEquals(int(res[0]['msDS-PasswordHistoryLength'][0]), + self.assertEqual(str(plaintext_res), plaintext_str) + self.assertEqual(int(res[0]['msDS-PasswordHistoryLength'][0]), pso.history_len) - self.assertEquals(int(res[0]['msDS-MinimumPasswordLength'][0]), + self.assertEqual(int(res[0]['msDS-MinimumPasswordLength'][0]), pso.password_len) - self.assertEquals(int(res[0]['msDS-MinimumPasswordAge'][0]), min_age) - self.assertEquals(int(res[0]['msDS-MaximumPasswordAge'][0]), max_age) - self.assertEquals(int(res[0]['msDS-LockoutObservationWindow'][0]), + self.assertEqual(int(res[0]['msDS-MinimumPasswordAge'][0]), min_age) + self.assertEqual(int(res[0]['msDS-MaximumPasswordAge'][0]), max_age) + self.assertEqual(int(res[0]['msDS-LockoutObservationWindow'][0]), lockout_window) - self.assertEquals(int(res[0]['msDS-LockoutDuration'][0]), + self.assertEqual(int(res[0]['msDS-LockoutDuration'][0]), lockout_duration) - self.assertEquals(int(res[0]['msDS-LockoutThreshold'][0]), + self.assertEqual(int(res[0]['msDS-LockoutThreshold'][0]), pso.lockout_attempts) - self.assertEquals(int(res[0]['msDS-PasswordSettingsPrecedence'][0]), + self.assertEqual(int(res[0]['msDS-PasswordSettingsPrecedence'][0]), pso.precedence) # check we can also display the PSO via the show command @@ -121,7 +121,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): self.obj_cleanup.append("CN=%s,%s" % (pso_name, self.pso_container)) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("successfully created", out) self.check_pso(pso_name, expected_pso) @@ -163,7 +163,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): self.user_auth) self.obj_cleanup.append("CN=%s,%s" % (pso_name, self.pso_container)) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("successfully created", out) self.check_pso(pso_name, expected_pso) @@ -195,7 +195,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): # sanity-check the cmd was successful self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("successfully created", out) self.check_pso(pso_name, pso_settings) @@ -219,7 +219,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): "-H", self.server, self.user_auth) self.assertCmdSuccess(res, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("Successfully updated", out) # check the PSO's settings now reflect the new values @@ -237,7 +237,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("Deleted PSO", out) dn = "CN=%s,%s" % (pso_name, self.pso_container) self.obj_cleanup.remove(dn) @@ -248,7 +248,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): self.fail("PSO shouldn't exist") except ldb.LdbError as e: (enum, estr) = e.args - self.assertEquals(enum, ldb.ERR_NO_SUCH_OBJECT) + self.assertEqual(enum, ldb.ERR_NO_SUCH_OBJECT) # run the same cmd again - it should fail because PSO no longer exists (result, out, err) = self.runsublevelcmd("domain", ("passwordsettings", @@ -267,7 +267,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): user.name, "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") if pso is None: self.assertIn("No PSO applies to user", out) else: @@ -275,9 +275,9 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): # then check the DB tells us the same thing if pso is None: - self.assertEquals(user.get_resultant_PSO(), None) + self.assertEqual(user.get_resultant_PSO(), None) else: - self.assertEquals(user.get_resultant_PSO(), pso.dn) + self.assertEqual(user.get_resultant_PSO(), pso.dn) def test_pso_apply_to_user(self): """Checks we can apply/unapply a PSO to a user""" @@ -307,7 +307,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): group_name, "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.check_pso_applied(user, pso=test_pso) # we should fail if we try to apply the same PSO/group twice though @@ -324,7 +324,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): user.name, "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.check_pso_applied(user, pso=test_pso) # check samba-tool can successfully unlink a group from a PSO @@ -333,7 +333,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): group_name, "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") # PSO still applies directly to the user, even though group was removed self.check_pso_applied(user, pso=test_pso) @@ -343,7 +343,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): user.name, "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.check_pso_applied(user, pso=None) def test_pso_unpriv(self): @@ -418,7 +418,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): "show"), "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") # check an arbitrary setting is displayed correctly min_pwd_len = self.ldb.get_minPwdLength() @@ -433,16 +433,16 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("successful", out) - self.assertEquals(new_len, self.ldb.get_minPwdLength()) + self.assertEqual(new_len, self.ldb.get_minPwdLength()) # check the updated value is now displayed (result, out, err) = self.runsublevelcmd("domain", ("passwordsettings", "show"), "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("Minimum password length: %u" % new_len, out) def test_domain_passwordsettings_pwdage(self): @@ -457,7 +457,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("successful", out) self.assertNotEquals(max_pwd_age, self.ldb.get_maxPwdAge()) @@ -479,6 +479,6 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): "-H", self.server, self.user_auth) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("successful", out) self.assertNotEquals(min_pwd_age, self.ldb.get_minPwdAge()) diff --git a/python/samba/tests/samba_tool/promote_dc_lmdb_size.py b/python/samba/tests/samba_tool/promote_dc_lmdb_size.py index 5e682ca506f..8e679a5c95f 100644 --- a/python/samba/tests/samba_tool/promote_dc_lmdb_size.py +++ b/python/samba/tests/samba_tool/promote_dc_lmdb_size.py @@ -105,9 +105,9 @@ class PromoteDcLmdbSizeTestCase(SambaToolCmdTest): # 8Gb is used def test_promote_dc_default(self): (result, out, err) = self.join_member() - self.assertEquals(0, result) + self.assertEqual(0, result) (result, out, err) = self.promote(role="DC") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(8 * 1024 * 1024 * 1024) self.assertFalse(self.is_rodc()) @@ -116,9 +116,9 @@ class PromoteDcLmdbSizeTestCase(SambaToolCmdTest): # 8Gb is used def test_promote_rodc_default(self): (result, out, err) = self.join_member() - self.assertEquals(0, result) + self.assertEqual(0, result) (result, out, err) = self.promote(role="RODC") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(8 * 1024 * 1024 * 1024) self.assertTrue(self.is_rodc()) @@ -126,9 +126,9 @@ class PromoteDcLmdbSizeTestCase(SambaToolCmdTest): # Promote to a DC with a backend size of 96Mb def test_promote_dc_96Mb(self): (result, out, err) = self.join_member() - self.assertEquals(0, result) + self.assertEqual(0, result) (result, out, err) = self.promote(role="DC", size="96Mb") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(96 * 1024 * 1024) self.assertFalse(self.is_rodc()) @@ -136,9 +136,9 @@ class PromoteDcLmdbSizeTestCase(SambaToolCmdTest): # Promote to an RODC with a backend size of 256Mb def test_promote_rodc_256Mb(self): (result, out, err) = self.join_member() - self.assertEquals(0, result) + self.assertEqual(0, result) (result, out, err) = self.promote(role="RODC", size="256Mb") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(256 * 1024 * 1024) self.assertTrue(self.is_rodc()) diff --git a/python/samba/tests/samba_tool/provision_lmdb_size.py b/python/samba/tests/samba_tool/provision_lmdb_size.py index c48cb67eac5..970486622df 100644 --- a/python/samba/tests/samba_tool/provision_lmdb_size.py +++ b/python/samba/tests/samba_tool/provision_lmdb_size.py @@ -84,24 +84,24 @@ class ProvisionLmdbSizeTestCase(SambaToolCmdTest): # 8Gb is used def test_default(self): (result, out, err) = self.provision() - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(8 * 1024 * 1024 * 1024) def test_64Mb(self): (result, out, err) = self.provision("64Mb") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(64 * 1024 * 1024) def test_1Gb(self): (result, out, err) = self.provision("1Gb") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(1 * 1024 * 1024 * 1024) # 128Mb specified in bytes. # def test_134217728b(self): (result, out, err) = self.provision("134217728b") - self.assertEquals(0, result) + self.assertEqual(0, result) self.check_lmdb_environment_sizes(134217728) def test_no_unit_suffix(self): diff --git a/python/samba/tests/samba_tool/schema.py b/python/samba/tests/samba_tool/schema.py index 7a80b33cd26..6f899ef4b68 100644 --- a/python/samba/tests/samba_tool/schema.py +++ b/python/samba/tests/samba_tool/schema.py @@ -41,7 +41,7 @@ class SchemaCmdTestCase(SambaToolCmdTest): os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("dn: CN=uid,CN=Schema,CN=Configuration,", out) def test_modify_attribute_searchflags(self): @@ -61,7 +61,7 @@ class SchemaCmdTestCase(SambaToolCmdTest): os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("modified cn=uid,CN=Schema,CN=Configuration,", out) (result, out, err) = self.runsublevelcmd("schema", ("attribute", @@ -72,7 +72,7 @@ class SchemaCmdTestCase(SambaToolCmdTest): os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("modified cn=uid,CN=Schema,CN=Configuration,", out) (result, out, err) = self.runsublevelcmd("schema", ("attribute", @@ -83,7 +83,7 @@ class SchemaCmdTestCase(SambaToolCmdTest): os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("modified cn=uid,CN=Schema,CN=Configuration,", out) def test_show_oc_attribute(self): @@ -95,7 +95,7 @@ class SchemaCmdTestCase(SambaToolCmdTest): os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("--- MAY contain ---", out) self.assertIn("--- MUST contain ---", out) @@ -108,5 +108,5 @@ class SchemaCmdTestCase(SambaToolCmdTest): os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("dn: CN=Person,CN=Schema,CN=Configuration,", out) diff --git a/python/samba/tests/samba_tool/sites.py b/python/samba/tests/samba_tool/sites.py index 89197f7764a..1009cf28b98 100644 --- a/python/samba/tests/samba_tool/sites.py +++ b/python/samba/tests/samba_tool/sites.py @@ -51,7 +51,7 @@ class SitesCmdTestCase(BaseSitesCmdTestCase): ret = self.samdb.search(base=dnsites, scope=ldb.SCOPE_ONELEVEL, expression='(cn=%s)' % sitename) - self.assertEquals(len(ret), 1) + self.assertEqual(len(ret), 1) # now delete it self.samdb.delete(dnsite, ["tree_delete:0"]) diff --git a/python/samba/tests/samba_tool/timecmd.py b/python/samba/tests/samba_tool/timecmd.py index 1db51dc73e9..8e286f67f37 100644 --- a/python/samba/tests/samba_tool/timecmd.py +++ b/python/samba/tests/samba_tool/timecmd.py @@ -39,6 +39,6 @@ class TimeCmdTestCase(SambaToolCmdTest): def test_timefail(self): """Run time against a non-existent server, and make sure it fails""" (result, out, err) = self.runcmd("time", "notaserver") - self.assertEquals(result, -1, "check for result code") + self.assertEqual(result, -1, "check for result code") self.assertNotEqual(err.strip().find("NT_STATUS_OBJECT_NAME_NOT_FOUND"), -1, "ensure right error string") - self.assertEquals(out, "", "ensure no output returned") + self.assertEqual(out, "", "ensure no output returned") diff --git a/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py index 65930ed89de..2ca32a26ed7 100644 --- a/python/samba/tests/samba_tool/user.py +++ b/python/samba/tests/samba_tool/user.py @@ -60,7 +60,7 @@ class UserCmdTestCase(SambaToolCmdTest): (result, out, err) = user["createUserFn"](user) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") if 'unix' in user["name"]: self.assertIn("Modified User '%s' successfully" % user["name"], out) @@ -112,13 +112,13 @@ class UserCmdTestCase(SambaToolCmdTest): "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("User '%s' created successfully" % user["name"], out) found = self._find_user(user["name"]) - self.assertEquals("%s" % found.get("cn"), "%(name)s" % user) - self.assertEquals("%s" % found.get("name"), "%(name)s" % user) + self.assertEqual("%s" % found.get("cn"), "%(name)s" % user) + self.assertEqual("%s" % found.get("name"), "%(name)s" % user) def _verify_supplementalCredentials(self, ldif, min_packages=3, @@ -212,7 +212,7 @@ class UserCmdTestCase(SambaToolCmdTest): "-H", "ldap://%s" % os.environ["DC_SERVER"], "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err, "Ensure setpassword runs") - self.assertEquals(err, "", "setpassword with url") + self.assertEqual(err, "", "setpassword with url") self.assertMatch(out, "Changed password OK", "setpassword with url") attributes = "sAMAccountName,unicodePwd,supplementalCredentials,virtualClearTextUTF8,virtualClearTextUTF16,virtualSSHA,virtualSambaGPG" @@ -260,7 +260,7 @@ class UserCmdTestCase(SambaToolCmdTest): user["name"], "--newpassword=%s" % newpasswd) self.assertCmdSuccess(result, out, err, "Ensure setpassword runs") - self.assertEquals(err, "", "setpassword without url") + self.assertEqual(err, "", "setpassword without url") self.assertMatch(out, "Changed password OK", "setpassword without url") (result, out, err) = self.runsubcmd("user", "syncpasswords", "--no-wait") @@ -317,7 +317,7 @@ class UserCmdTestCase(SambaToolCmdTest): "-H", "ldap://%s" % os.environ["DC_SERVER"], "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err, "Ensure setpassword runs") - self.assertEquals(err, "", "setpassword with forced change") + self.assertEqual(err, "", "setpassword with forced change") self.assertMatch(out, "Changed password OK", "setpassword with forced change") def test_setexpiry(self): @@ -451,7 +451,7 @@ sAMAccountName: %s full_ou_dn = str(self.samdb.normalize_dn_in_domain("OU=movetest")) (result, out, err) = self.runsubcmd("ou", "create", full_ou_dn) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "There shouldn't be any error message") + self.assertEqual(err, "", "There shouldn't be any error message") self.assertIn('Created ou "%s"' % full_ou_dn, out) for user in self.users: @@ -524,7 +524,7 @@ sAMAccountName: %s "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("User '%s' created successfully" % user["name"], out) self._check_posix_user(user) @@ -553,7 +553,7 @@ sAMAccountName: %s "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])) self.assertCmdSuccess(result, out, err) - self.assertEquals(err, "", "Shouldn't be any error messages") + self.assertEqual(err, "", "Shouldn't be any error messages") self.assertIn("User '%s' created successfully" % user["name"], out) self._check_posix_user(user) @@ -616,21 +616,21 @@ sAMAccountName: %s """ check if a user from SamDB has the same attributes as its template """ found = self._find_user(user["name"]) - self.assertEquals("%s" % found.get("name"), "%(given-name)s %(surname)s" % user) - self.assertEquals("%s" % found.get("title"), user["job-title"]) - self.assertEquals("%s" % found.get("company"), user["company"]) - self.assertEquals("%s" % found.get("description"), user["description"]) - self.assertEquals("%s" % found.get("department"), user["department"]) + self.assertEqual("%s" % found.get("name"), "%(given-name)s %(surname)s" % user) + self.assertEqual("%s" % found.get("title"), user["job-title"]) + self.assertEqual("%s" % found.get("company"), user["company"]) + self.assertEqual("%s" % found.get("description"), user["description"]) + self.assertEqual("%s" % found.get("department"), user["department"]) def _check_posix_user(self, user): """ check if a posix_user from SamDB has the same attributes as its template """ found = self._find_user(user["name"]) - self.assertEquals("%s" % found.get("loginShell"), user["loginShell"]) - self.assertEquals("%s" % found.get("gecos"), user["gecos"]) - self.assertEquals("%s" % found.get("uidNumber"), "%s" % user["uidNumber"]) - self.assertEquals("%s" % found.get("gidNumber"), "%s" % user["gidNumber"]) - self.assertEquals("%s" % found.get("uid"), user["uid"]) + self.assertEqual("%s" % found.get("loginShell"), user["loginShell"]) + self.assertEqual("%s" % found.get("gecos"), user["gecos"]) + self.assertEqual("%s" % found.get("uidNumber"), "%s" % user["uidNumber"]) + self.assertEqual("%s" % found.get("gidNumber"), "%s" % user["gidNumber"]) + self.assertEqual("%s" % found.get("uid"), user["uid"]) self._check_user(user) def _check_unix_user(self, user): @@ -638,13 +638,13 @@ sAMAccountName: %s template """ found = self._find_user(user["name"]) - self.assertEquals("%s" % found.get("loginShell"), user["loginShell"]) - self.assertEquals("%s" % found.get("gecos"), user["gecos"]) - self.assertEquals("%s" % found.get("uidNumber"), "%s" % + self.assertEqual("%s" % found.get("loginShell"), user["loginShell"]) + self.assertEqual("%s" % found.get("gecos"), user["gecos"]) + self.assertEqual("%s" % found.get("uidNumber"), "%s" % user["uidNumber"]) - self.assertEquals("%s" % found.get("gidNumber"), "%s" % + self.assertEqual("%s" % found.get("gidNumber"), "%s" % user["gidNumber"]) - self.assertEquals("%s" % found.get("uid"), user["uid"]) + self.assertEqual("%s" % found.get("uid"), user["uid"]) self._check_user(user) def _create_user(self, user): diff --git a/python/samba/tests/samba_tool/user_virtualCryptSHA.py b/python/samba/tests/samba_tool/user_virtualCryptSHA.py index f488bc7799d..3db6ffddacd 100644 --- a/python/samba/tests/samba_tool/user_virtualCryptSHA.py +++ b/python/samba/tests/samba_tool/user_virtualCryptSHA.py @@ -329,8 +329,8 @@ class UserCmdCryptShaTestCase(SambaToolCmdTest): 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 @@ -352,8 +352,8 @@ class UserCmdCryptShaTestCase(SambaToolCmdTest): 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 @@ -379,8 +379,8 @@ class UserCmdCryptShaTestCase(SambaToolCmdTest): 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")) @@ -411,15 +411,15 @@ class UserCmdCryptShaTestCase(SambaToolCmdTest): 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 coresponding 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")) # gpg decryption enabled. # both virtual attributes specified, no rounds option @@ -440,8 +440,8 @@ class UserCmdCryptShaTestCase(SambaToolCmdTest): sha512 = _get_attribute(out, "virtualCryptSHA512") out = self._get_password("virtualCryptSHA256,virtualCryptSHA512", 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")) # gpg decryption enabled. # both virtual attributes specified, rounds specified @@ -499,8 +499,8 @@ class UserCmdCryptShaTestCase(SambaToolCmdTest): 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/visualize_drs.py b/python/samba/tests/samba_tool/visualize_drs.py index 9b1588bd1ef..3eda02783f6 100644 --- a/python/samba/tests/samba_tool/visualize_drs.py +++ b/python/samba/tests/samba_tool/visualize_drs.py @@ -223,7 +223,7 @@ class SambaToolVisualizeDrsTest(SambaToolCmdTest): self.assertCmdSuccess(result, out, err) lines = out.splitlines() - self.assertEquals(len(lines), 1) + self.assertEqual(len(lines), 1) line = lines[0] self.assertTrue(line.startswith('DOMAIN')) |