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

python: Replace calls to deprecated methods

Browse Source 
These aliases are deprecated and have been 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-01-19 08:37:03 +13:00
committed by Andrew Bartlett
parent a15208f60b
commit 41aa379abb
17 changed files with 145 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
python/samba/tests/audit_log_dsdb.py
View File

@@ -144,7 +144,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
self.assertEqual("Modify", audit["operation"])
self.assertFalse(audit["performedAsSystem"])
self.assertTrue(dn.lower(), audit["dn"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
session_id = self.get_session()
self.assertEqual(session_id, audit["sessionId"])
@@ -185,7 +185,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
self.assertEqual("Modify", audit["operation"])
self.assertFalse(audit["performedAsSystem"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
session_id = self.get_session()
self.assertEqual(session_id, audit["sessionId"])
@@ -227,7 +227,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
self.assertEqual("Modify", audit["operation"])
self.assertFalse(audit["performedAsSystem"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -266,7 +266,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
self.assertEqual("Modify", audit["operation"])
self.assertFalse(audit["performedAsSystem"])
self.assertTrue(dn.lower(), audit["dn"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -297,7 +297,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
self.assertEqual("Add", audit["operation"])
self.assertFalse(audit["performedAsSystem"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
session_id = self.get_session()
self.assertEqual(session_id, audit["sessionId"])
@@ -343,7 +343,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
self.assertEqual("Delete", audit["operation"])
self.assertFalse(audit["performedAsSystem"])
self.assertTrue(dn.lower(), audit["dn"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
self.assertEqual(0, audit["statusCode"])
@@ -383,7 +383,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
self.assertEqual("Delete", audit["operation"])
self.assertFalse(audit["performedAsSystem"])
self.assertTrue(dn.lower(), audit["dn"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertEqual(ERR_NO_SUCH_OBJECT, audit["statusCode"])
self.assertEqual("No such object", audit["status"])
@@ -431,7 +431,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
self.assertEqual("Add", audit["operation"])
self.assertTrue(audit["performedAsSystem"])
self.assertTrue(dn.lower(), audit["dn"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -480,7 +480,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
self.assertEqual("Delete", audit["operation"])
self.assertTrue(audit["performedAsSystem"])
self.assertTrue(dn.lower(), audit["dn"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -514,7 +514,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
self.assertEqual("Modify", audit["operation"])
self.assertFalse(audit["performedAsSystem"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()

14
python/samba/tests/audit_log_pass_change.py
View File

@@ -125,7 +125,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
self.assertEqual(EVT_ID_PASSWORD_CHANGE, audit["eventId"])
self.assertEqual("Change", audit["action"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
session_id = self.get_session()
self.assertEqual(session_id, audit["sessionId"])
@@ -154,7 +154,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
self.assertEqual(EVT_ID_PASSWORD_RESET, audit["eventId"])
self.assertEqual("Reset", audit["action"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
session_id = self.get_session()
self.assertEqual(session_id, audit["sessionId"])
@@ -195,7 +195,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
self.assertEqual(EVT_ID_PASSWORD_RESET, audit["eventId"])
self.assertEqual("Reset", audit["action"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
session_id = self.get_session()
self.assertEqual(session_id, audit["sessionId"])
@@ -232,7 +232,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
self.assertEqual(EVT_ID_PASSWORD_RESET, audit["eventId"])
self.assertEqual("Reset", audit["action"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
session_id = self.get_session()
self.assertEqual(session_id, audit["sessionId"])
@@ -266,7 +266,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
self.assertEqual(EVT_ID_PASSWORD_CHANGE, audit["eventId"])
self.assertEqual("Change", audit["action"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -297,7 +297,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
self.assertEqual(EVT_ID_PASSWORD_RESET, audit["eventId"])
self.assertEqual("Reset", audit["action"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -324,7 +324,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
self.assertEqual(EVT_ID_PASSWORD_RESET, audit["eventId"])
self.assertEqual("Reset", audit["action"])
self.assertEqual(dn, audit["dn"])
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
session_id = self.get_session()
self.assertEqual(session_id, audit["sessionId"])

8
python/samba/tests/gpo.py
View File

@@ -6341,7 +6341,7 @@ class GPOTests(tests.TestCase):
gp_db = store.get_gplog(machine_creds.get_username())
del_gpos = get_deleted_gpos_list(gp_db, [])
ext.process_group_policy(del_gpos, [], f.name)
self.assertNotEquals(open(f.name, 'r').read(), text.text,
self.assertNotEqual(open(f.name, 'r').read(), text.text,
'The motd was not unapplied')
# Unstage the Registry.pol file
@@ -6394,7 +6394,7 @@ class GPOTests(tests.TestCase):
gp_db = store.get_gplog(machine_creds.get_username())
del_gpos = get_deleted_gpos_list(gp_db, [])
ext.process_group_policy(del_gpos, [], f.name)
self.assertNotEquals(open(f.name, 'r').read(), text.text,
self.assertNotEqual(open(f.name, 'r').read(), text.text,
'The issue was not unapplied')
# Unstage the manifest.xml file
@@ -7066,7 +7066,7 @@ class GPOTests(tests.TestCase):
'Number of Chromium policies is incorrect')
omanaged_file = managed_file
managed_file = os.path.join(managed, managed_files[0])
self.assertNotEquals(omanaged_file, managed_file,
self.assertNotEqual(omanaged_file, managed_file,
'The managed Chromium file did not change')
recommended_files = os.listdir(recommended)
@@ -7074,7 +7074,7 @@ class GPOTests(tests.TestCase):
'Number of Chromium policies is incorrect')
orecommended_file = recommended_file
recommended_file = os.path.join(recommended, recommended_files[0])
self.assertNotEquals(orecommended_file, recommended_file,
self.assertNotEqual(orecommended_file, recommended_file,
'The recommended Chromium file did not change')
# Verify RSOP does not fail

24
python/samba/tests/group_audit.py
View File

@@ -113,7 +113,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=domain users,cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -129,7 +129,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=domain users,cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -154,7 +154,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=" + GROUP_NAME_01 + ",cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -180,7 +180,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=" + GROUP_NAME_02 + ",cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -208,7 +208,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=" + GROUP_NAME_01 + ",cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -234,7 +234,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=" + GROUP_NAME_01 + ",cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -261,7 +261,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=domain users,cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -277,7 +277,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=domain users,cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -304,7 +304,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=" + GROUP_NAME_01 + ",cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -352,7 +352,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=" + GROUP_NAME_01 + ",cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -369,7 +369,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=domain users,cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()
@@ -386,7 +386,7 @@ class GroupAuditTests(AuditLogTestBase):
group_dn = "cn=" + GROUP_NAME_01 + ",cn=users," + self.base_dn
self.assertTrue(user_dn.lower(), audit["user"].lower())
self.assertTrue(group_dn.lower(), audit["group"].lower())
self.assertRegexpMatches(audit["remoteAddress"],
self.assertRegex(audit["remoteAddress"],
self.remoteAddress)
self.assertTrue(self.is_guid(audit["sessionId"]))
session_id = self.get_session()

18
python/samba/tests/prefork_restart.py
View File

@@ -190,12 +190,12 @@ class PreforkProcessRestartTests(TestCase):
self.assertIsNotNone(new_pid)
# check that the pid has changed
self.assertNotEquals(pid, new_pid)
self.assertNotEqual(pid, new_pid)
# check that the worker processes have restarted
new_workers = self.get_worker_pids("ldap", NUM_WORKERS)
for x in range(NUM_WORKERS):
self.assertNotEquals(workers[x], new_workers[x])
self.assertNotEqual(workers[x], new_workers[x])
# check that the previous server entries have been removed.
self.check_for_duplicate_processes()
@@ -230,7 +230,7 @@ class PreforkProcessRestartTests(TestCase):
# check that the worker processes have restarted
new_workers = self.get_worker_pids("ldap", NUM_WORKERS)
# process 0 should have a new pid the others should be unchanged
self.assertNotEquals(workers[0], new_workers[0])
self.assertNotEqual(workers[0], new_workers[0])
self.assertEqual(workers[1], new_workers[1])
self.assertEqual(workers[2], new_workers[2])
self.assertEqual(workers[3], new_workers[3])
@@ -273,7 +273,7 @@ class PreforkProcessRestartTests(TestCase):
# check that the worker processes have restarted
new_workers = self.get_worker_pids("ldap", NUM_WORKERS)
for x in range(NUM_WORKERS):
self.assertNotEquals(workers[x], new_workers[x])
self.assertNotEqual(workers[x], new_workers[x])
# check that the previous server entries have been removed.
self.check_for_duplicate_processes()
@@ -306,12 +306,12 @@ class PreforkProcessRestartTests(TestCase):
self.assertIsNotNone(new_pid)
# check that the pid has changed
self.assertNotEquals(pid, new_pid)
self.assertNotEqual(pid, new_pid)
# check that the worker processes have restarted
new_workers = self.get_worker_pids("rpc", NUM_WORKERS)
for x in range(NUM_WORKERS):
self.assertNotEquals(workers[x], new_workers[x])
self.assertNotEqual(workers[x], new_workers[x])
# check that the previous server entries have been removed.
self.check_for_duplicate_processes()
@@ -347,7 +347,7 @@ class PreforkProcessRestartTests(TestCase):
# check that the worker processes have restarted
new_workers = self.get_worker_pids("rpc", NUM_WORKERS)
# process 0 should have a new pid the others should be unchanged
self.assertNotEquals(workers[0], new_workers[0])
self.assertNotEqual(workers[0], new_workers[0])
self.assertEqual(workers[1], new_workers[1])
self.assertEqual(workers[2], new_workers[2])
self.assertEqual(workers[3], new_workers[3])
@@ -390,7 +390,7 @@ class PreforkProcessRestartTests(TestCase):
# check that the worker processes have restarted
new_workers = self.get_worker_pids("rpc", NUM_WORKERS)
for x in range(NUM_WORKERS):
self.assertNotEquals(workers[x], new_workers[x])
self.assertNotEqual(workers[x], new_workers[x])
# check that the previous server entries have been removed.
self.check_for_duplicate_processes()
@@ -434,7 +434,7 @@ class PreforkProcessRestartTests(TestCase):
# check that the worker processes have restarted
new_workers = self.get_worker_pids("echo", NUM_WORKERS)
for x in range(NUM_WORKERS):
self.assertNotEquals(workers[x], new_workers[x])
self.assertNotEqual(workers[x], new_workers[x])
# check that the previous server entries have been removed.
self.check_for_duplicate_processes()

2
python/samba/tests/samba_tool/computer.py
View File

@@ -253,7 +253,7 @@ class ComputerCmdTestCase(SambaToolCmdTest):
self.assertIn('Moved computer "%s"' % computer["name"], out)
found = self._find_computer(computer["name"])
self.assertNotEquals(found.get("dn"), olddn,
self.assertNotEqual(found.get("dn"), olddn,
("Moved computer '%s' still exists with the "
"same dn" % computer["name"]))
computername = computer["name"].rstrip('$')

2
python/samba/tests/samba_tool/contact.py
View File

@@ -241,7 +241,7 @@ class ContactCmdTestCase(SambaToolCmdTest):
self.assertIn('Moved contact "%s"' % contact["expectedname"], out)
found = self._find_contact(contact["expectedname"])
self.assertNotEquals(found.get("dn"), olddn,
self.assertNotEqual(found.get("dn"), olddn,
("Moved contact '%s' still exists with the "
"same dn" % contact["expectedname"]))
contactname = contact["expectedname"]

6
python/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
View File

@@ -95,21 +95,21 @@ class DrsCloneDcDataLmdbSizeTestCase(SambaToolCmdTest):
(result, out, err) = self.run_command(
'samba-tool drs clone-dc-database --backend-store-size "2"')
self.assertGreater(result, 0)
self.assertRegexpMatches(err,
self.assertRegex(err,
r"--backend-store-size invalid suffix ''")
def test_invalid_unit_suffix(self):
(result, out, err) = self.run_command(
'samba-tool drs clone-dc-database --backend-store-size "2 cd"')
self.assertGreater(result, 0)
self.assertRegexpMatches(err,
self.assertRegex(err,
r"--backend-store-size invalid suffix 'cd'")
def test_non_numeric(self):
(result, out, err) = self.run_command(
'samba-tool drs clone-dc-database --backend-store-size "two Gb"')
self.assertGreater(result, 0)
self.assertRegexpMatches(
self.assertRegex(
err,
r"backend-store-size option requires a numeric value, with an"
" optional unit suffix")

6
python/samba/tests/samba_tool/join_lmdb_size.py
View File

@@ -128,21 +128,21 @@ class JoinLmdbSizeTestCase(SambaToolCmdTest):
(result, out, err) = self.run_command(
'samba-tool domain join --backend-store-size "2"')
self.assertGreater(result, 0)
self.assertRegexpMatches(err,
self.assertRegex(err,
r"--backend-store-size invalid suffix ''")
def test_invalid_unit_suffix(self):
(result, out, err) = self.run_command(
'samba-tool domain join --backend-store-size "2 cd"')
self.assertGreater(result, 0)
self.assertRegexpMatches(err,
self.assertRegex(err,
r"--backend-store-size invalid suffix 'cd'")
def test_non_numeric(self):
(result, out, err) = self.run_command(
'samba-tool domain join --backend-store-size "two Gb"')
self.assertGreater(result, 0)
self.assertRegexpMatches(
self.assertRegex(
err,
r"backend-store-size option requires a numeric value, with an"
" optional unit suffix")

2
python/samba/tests/samba_tool/ou.py
View File

@@ -204,7 +204,7 @@ class OUCmdTestCase(SambaToolCmdTest):
self.assertIn('Moved ou "%s"' % full_ou_dn, out)
found = self._find_ou(ou["name"])
self.assertNotEquals(found.get("dn"), olddn,
self.assertNotEqual(found.get("dn"), olddn,
"Moved ou '%s' still exists with the same dn" %
ou["name"])
newexpecteddn = ldb.Dn(self.samdb,

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

@@ -459,7 +459,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
self.assertCmdSuccess(result, out, err)
self.assertEqual(err, "", "Shouldn't be any error messages")
self.assertIn("successful", out)
self.assertNotEquals(max_pwd_age, self.ldb.get_maxPwdAge())
self.assertNotEqual(max_pwd_age, self.ldb.get_maxPwdAge())
# check we can't set the domain min password age to more than the max
min_pwd_age = self.ldb.get_minPwdAge()
@@ -481,4 +481,4 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
self.assertCmdSuccess(result, out, err)
self.assertEqual(err, "", "Shouldn't be any error messages")
self.assertIn("successful", out)
self.assertNotEquals(min_pwd_age, self.ldb.get_minPwdAge())
self.assertNotEqual(min_pwd_age, self.ldb.get_minPwdAge())

6
python/samba/tests/samba_tool/promote_dc_lmdb_size.py
View File

@@ -150,21 +150,21 @@ class PromoteDcLmdbSizeTestCase(SambaToolCmdTest):
(result, out, err) = self.run_command(
'samba-tool domain dcpromo --backend-store-size "2"')
self.assertGreater(result, 0)
self.assertRegexpMatches(err,
self.assertRegex(err,
r"--backend-store-size invalid suffix ''")
def test_invalid_unit_suffix(self):
(result, out, err) = self.run_command(
'samba-tool domain dcpromo --backend-store-size "2 cd"')
self.assertGreater(result, 0)
self.assertRegexpMatches(err,
self.assertRegex(err,
r"--backend-store-size invalid suffix 'cd'")
def test_non_numeric(self):
(result, out, err) = self.run_command(
'samba-tool domain dcpromo --backend-store-size "two Gb"')
self.assertGreater(result, 0)
self.assertRegexpMatches(
self.assertRegex(
err,
r"backend-store-size option requires a numeric value, with an"
" optional unit suffix")

6
python/samba/tests/samba_tool/provision_lmdb_size.py
View File

@@ -108,21 +108,21 @@ class ProvisionLmdbSizeTestCase(SambaToolCmdTest):
(result, out, err) = self.run_command(
'samba-tool domain provision --backend-store-size "2"')
self.assertGreater(result, 0)
self.assertRegexpMatches(err,
self.assertRegex(err,
r"--backend-store-size invalid suffix ''")
def test_invalid_unit_suffix(self):
(result, out, err) = self.run_command(
'samba-tool domain provision --backend-store-size "2 cd"')
self.assertGreater(result, 0)
self.assertRegexpMatches(err,
self.assertRegex(err,
r"--backend-store-size invalid suffix 'cd'")
def test_non_numeric(self):
(result, out, err) = self.run_command(
'samba-tool domain provision --backend-store-size "two Gb"')
self.assertGreater(result, 0)
self.assertRegexpMatches(
self.assertRegex(
err,
r"backend-store-size option requires a numeric value, with an"
" optional unit suffix")

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

@@ -41,12 +41,12 @@ class ProvisionPasswordTestCase(SambaToolCmdTest):
def test_short(self):
(result, out, err) = self._provision_with_password("Fo0!_9")
self.assertCmdFail(result)
self.assertRegexpMatches(err, r"minimum password length")
self.assertRegex(err, r"minimum password length")
def test_low_quality(self):
(result, out, err) = self._provision_with_password("aaaaaaaaaaaaaaaaa")
self.assertCmdFail(result)
self.assertRegexpMatches(err, r"quality standards")
self.assertRegex(err, r"quality standards")
def test_good(self):
(result, out, err) = self._provision_with_password("Fo0!_9.")

8
python/samba/tests/upgradeprovisionneeddc.py
View File

@@ -66,8 +66,8 @@ class UpgradeProvisionBasicLdbHelpersTestCase(TestCaseInTempDir):
paths, smb_conf_path, lp)
self.assertEqual(names.realm, "SAMBA.EXAMPLE.COM")
self.assertEqual(str(names.rootdn).lower(), rootdn.lower())
self.assertNotEquals(names.policyid_dc, None)
self.assertNotEquals(names.ntdsguid, "")
self.assertNotEqual(names.policyid_dc, None)
self.assertNotEqual(names.ntdsguid, "")
class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
@@ -158,7 +158,7 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
realm = self.lp.get("realm")
basedn = "DC=%s" % realm.replace(".", ", DC=")
oem = getOEMInfo(self.ldbs.sam, basedn)
self.assertNotEquals(oem, "")
self.assertNotEqual(oem, "")
def test_update_dns_account(self):
update_dns_account_password(self.ldbs.sam, self.ldbs.secrets,
@@ -170,7 +170,7 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
oem = getOEMInfo(self.ldbs.sam, basedn)
updateOEMInfo(self.ldbs.sam, basedn)
oem2 = getOEMInfo(self.ldbs.sam, basedn)
self.assertNotEquals(str(oem), str(oem2))
self.assertNotEqual(str(oem), str(oem2))
self.assertTrue(re.match(".*upgrade to.*", str(oem2)))
def tearDown(self):

20
source4/dsdb/tests/python/urgent_replication.py
View File

@@ -59,7 +59,7 @@ class UrgentReplicationTests(samba.tests.TestCase):
# urgent replication should not be enabled when creating
res = self.ldb.load_partition_usn(self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
self.assertNotEqual(res["uSNHighest"], res["uSNUrgent"])
# urgent replication should not be enabled when modifying
m = Message()
@@ -68,12 +68,12 @@ class UrgentReplicationTests(samba.tests.TestCase):
"description")
self.ldb.modify(m)
res = self.ldb.load_partition_usn(self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
self.assertNotEqual(res["uSNHighest"], res["uSNUrgent"])
# urgent replication should not be enabled when deleting
self.delete_force(self.ldb, "cn=nonurgenttest,cn=users," + self.base_dn)
res = self.ldb.load_partition_usn(self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
self.assertNotEqual(res["uSNHighest"], res["uSNUrgent"])
def test_nTDSDSA_object(self):
"""Test if the urgent replication is activated when handling a nTDSDSA object."""
@@ -104,7 +104,7 @@ systemFlags: 33554432""", ["relax:0"])
"options")
self.ldb.modify(m)
res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
self.assertNotEqual(res["uSNHighest"], res["uSNUrgent"])
# urgent replication should be enabled when deleting
self.delete_force(self.ldb, "cn=NTDS Settings test,cn=test server,cn=Servers,cn=Default-First-Site-Name,cn=Sites,cn=Configuration," + self.base_dn)
@@ -137,7 +137,7 @@ systemFlags: 33554432""", ["relax:0"])
"systemFlags")
self.ldb.modify(m)
res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
self.assertNotEqual(res["uSNHighest"], res["uSNUrgent"])
# urgent replication should be enabled when deleting
self.delete_force(self.ldb, "cn=test crossRef,CN=Partitions,CN=Configuration," + self.base_dn)
@@ -244,7 +244,7 @@ defaultHidingValue: TRUE""")
# urgent replication should NOT be enabled when deleting
self.delete_force(self.ldb, "cn=test secret,cn=System," + self.base_dn)
res = self.ldb.load_partition_usn(self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
self.assertNotEqual(res["uSNHighest"], res["uSNUrgent"])
def test_rIDManager_object(self):
"""Test if the urgent replication is activated when handling a rIDManager object."""
@@ -275,7 +275,7 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"])
# urgent replication should NOT be enabled when deleting
self.delete_force(self.ldb, "CN=RID Manager test,CN=System," + self.base_dn)
res = self.ldb.load_partition_usn(self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
self.assertNotEqual(res["uSNHighest"], res["uSNUrgent"])
def test_urgent_attributes(self):
"""Test if the urgent replication is activated when handling urgent attributes of an object."""
@@ -291,7 +291,7 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"])
# urgent replication should NOT be enabled when creating
res = self.ldb.load_partition_usn(self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
self.assertNotEqual(res["uSNHighest"], res["uSNUrgent"])
# urgent replication should be enabled when modifying userAccountControl
m = Message()
@@ -328,12 +328,12 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"])
FLAG_MOD_REPLACE, "description")
self.ldb.modify(m)
res = self.ldb.load_partition_usn(self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
self.assertNotEqual(res["uSNHighest"], res["uSNUrgent"])
# urgent replication should NOT be enabled when deleting
self.delete_force(self.ldb, "cn=user UrgAttr test,cn=users," + self.base_dn)
res = self.ldb.load_partition_usn(self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
self.assertNotEqual(res["uSNHighest"], res["uSNUrgent"])
TestProgram(module=__name__, opts=subunitopts)

22
source4/torture/drs/python/samba_tool_drs_showrepl.py
View File

@@ -78,7 +78,7 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase):
self.assertEqual(_outbound, ' OUTBOUND NEIGHBORS ')
self.assertEqual(_conn, ' KCC CONNECTION OBJECTS ')
self.assertRegexpMatches(header,
self.assertRegex(header,
r'^Default-First-Site-Name\\LOCALDC\s+'
r"DSA Options: %s\s+"
r"DSA object GUID: %s\s+"
@@ -91,7 +91,7 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase):
for p in ['CN=Configuration,DC=samba,DC=example,DC=com',
'DC=samba,DC=example,DC=com',
'CN=Schema,CN=Configuration,DC=samba,DC=example,DC=com']:
self.assertRegexpMatches(
self.assertRegex(
inbound,
r'%s\n'
r'\tDefault-First-Site-Name\\[A-Z]+ via RPC\n'
@@ -102,7 +102,7 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase):
r'\n' % (p, GUID_RE),
msg="%s inbound missing" % p)
self.assertRegexpMatches(
self.assertRegex(
outbound,
r'%s\n'
r'\tDefault-First-Site-Name\\[A-Z]+ via RPC\n'
@@ -113,7 +113,7 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase):
r'\n' % (p, GUID_RE),
msg="%s outbound missing" % p)
self.assertRegexpMatches(conn,
self.assertRegex(conn,
r'Connection --\n'
r'\tConnection name: %s\n'
r'\tEnabled : TRUE\n'
@@ -134,30 +134,30 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase):
# dsa
for k in ["objectGUID", "invocationId"]:
self.assertRegexpMatches(d['dsa'][k], '^%s$' % GUID_RE)
self.assertRegex(d['dsa'][k], '^%s$' % GUID_RE)
self.assertTrue(isinstance(d['dsa']["options"], int))
# repsfrom and repsto
for reps in (d['repsFrom'], d['repsTo']):
for r in reps:
for k in ('NC dn', "NTDS DN"):
self.assertRegexpMatches(r[k], '^%s$' % DN_RE)
self.assertRegex(r[k], '^%s$' % DN_RE)
for k in ("last attempt time",
"last attempt message",
"last success"):
self.assertTrue(isinstance(r[k], str))
self.assertRegexpMatches(r["DSA objectGUID"], '^%s$' % GUID_RE)
self.assertRegex(r["DSA objectGUID"], '^%s$' % GUID_RE)
self.assertTrue(isinstance(r["consecutive failures"], int))
# ntdsconnection
for n in d["NTDSConnections"]:
self.assertRegexpMatches(n["dns name"],
self.assertRegex(n["dns name"],
r'^[\w]+\.samba\.example\.com$')
self.assertRegexpMatches(n["name"], "^%s$" % GUID_RE)
self.assertRegex(n["name"], "^%s$" % GUID_RE)
self.assertTrue(isinstance(n['enabled'], bool))
self.assertTrue(isinstance(n['options'], int))
self.assertTrue(isinstance(n['replicates NC'], list))
self.assertRegexpMatches(n["remote DN"], "^%s$" % DN_RE)
self.assertRegex(n["remote DN"], "^%s$" % DN_RE)
def _force_all_reps(self, samdb, dc, direction):
if direction == 'inbound':
@@ -354,7 +354,7 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase):
e.returncode,
e.msg,
e.cmd))
self.assertRegexpMatches(
self.assertRegex(
e_stdout,
r'result 845[67] '
r'\(WERR_DS_DRA_(SINK|SOURCE)_DISABLED\)',