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

pytests: heed assertEquals deprecation warning en-masse

Browse Source 
TestCase.assertEquals() is an alias for TestCase.assertEqual() and
has been deprecated since Python 2.7.

When we run our tests with in python developer mode (`PYTHONDEVMODE=1
make test`) we get 580 DeprecationWarnings about this.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Douglas Bagnall
2020-02-07 11:02:38 +13:00
committed by Noel Power
parent 3bc7acc626
commit c247afbda0
129 changed files with 3795 additions and 3795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir):
paths.dns_keytab = "no.dns.keytab"
ldb = setup_secretsdb(paths, None, None, lp=env_loadparm())
try:
self.assertEquals("LSA Secrets",
self.assertEqual("LSA Secrets",
ldb.searchone(basedn="CN=LSA Secrets", attribute="CN").decode('utf8'))
finally:
del ldb
@ -84,14 +84,14 @@ class FindNssTests(TestCase):
self.assertRaises(KeyError, findnss, x, [])
def test_first(self):
self.assertEquals("bla", findnss(lambda x: "bla", ["bla"]))
self.assertEqual("bla", findnss(lambda x: "bla", ["bla"]))
def test_skip_first(self):
def x(y):
if y != "bla":
raise KeyError
return "ha"
self.assertEquals("ha", findnss(x, ["bloe", "bla"]))
self.assertEqual("ha", findnss(x, ["bloe", "bla"]))
class Disabled(object):
@ -124,22 +124,22 @@ class Disabled(object):
class SanitizeServerRoleTests(TestCase):
def test_same(self):
self.assertEquals("standalone server",
self.assertEqual("standalone server",
sanitize_server_role("standalone server"))
self.assertEquals("member server",
self.assertEqual("member server",
sanitize_server_role("member server"))
def test_invalid(self):
self.assertRaises(ValueError, sanitize_server_role, "foo")
def test_valid(self):
self.assertEquals(
self.assertEqual(
"standalone server",
sanitize_server_role("ROLE_STANDALONE"))
self.assertEquals(
self.assertEqual(
"standalone server",
sanitize_server_role("standalone"))
self.assertEquals(
self.assertEqual(
"active directory domain controller",
sanitize_server_role("domain controller"))
@ -174,7 +174,7 @@ class ProvisionResultTests(TestCase):
def test_basic_report_logger(self):
result = self.base_result()
entries = self.report_logger(result)
self.assertEquals(entries, [
self.assertEqual(entries, [
('INFO', 'Once the above files are installed, your Samba AD server '
'will be ready to use'),
('INFO', 'Server Role: domain controller'),
@ -188,14 +188,14 @@ class ProvisionResultTests(TestCase):
result.adminpass_generated = True
result.adminpass = "geheim"
entries = self.report_logger(result)
self.assertEquals(entries[1],
self.assertEqual(entries[1],
("INFO", 'Admin password: geheim'))
class DetermineNetbiosNameTests(TestCase):
def test_limits_to_15(self):
self.assertEquals("A" * 15, determine_netbios_name("a" * 30))
self.assertEqual("A" * 15, determine_netbios_name("a" * 30))
def test_strips_invalid(self):
self.assertEquals("BLABLA", determine_netbios_name("bla/bla"))
self.assertEqual("BLABLA", determine_netbios_name("bla/bla"))