sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-12 12:23:50 +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

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

@@ -39,12 +39,12 @@ class LoadParmTestCase(samba.tests.TestCaseInTempDir):
def test_length(self):
file = param.LoadParm()
self.assertEquals(0, len(file))
self.assertEqual(0, len(file))
def test_set_workgroup(self):
file = param.LoadParm()
file.set("workgroup", "bla")
self.assertEquals("BLA", file.get("workgroup"))
self.assertEqual("BLA", file.get("workgroup"))
def test_is_mydomain(self):
file = param.LoadParm()
@@ -70,16 +70,16 @@ class LoadParmTestCase(samba.tests.TestCaseInTempDir):
def test_log_level(self):
samba_lp = param.LoadParm()
samba_lp.set("log level", "5 auth:4")
self.assertEquals(5, samba_lp.log_level())
self.assertEqual(5, samba_lp.log_level())
def test_dump(self):
samba_lp = param.LoadParm()
# Just test successfull method execution (outputs to stdout)
self.assertEquals(None, samba_lp.dump())
self.assertEqual(None, samba_lp.dump())
def test_dump_to_file(self):
samba_lp = param.LoadParm()
self.assertEquals(None, samba_lp.dump(False, self.tempf))
self.assertEqual(None, samba_lp.dump(False, self.tempf))
content = open(self.tempf, 'r').read()
self.assertIn('[global]', content)
self.assertIn('interfaces', content)
@@ -88,12 +88,12 @@ class LoadParmTestCase(samba.tests.TestCaseInTempDir):
samba_lp = param.LoadParm()
samba_lp.load_default()
# Just test successfull method execution
self.assertEquals(None, samba_lp.dump_a_parameter('interfaces'))
self.assertEqual(None, samba_lp.dump_a_parameter('interfaces'))
def test_dump_a_parameter_to_file(self):
samba_lp = param.LoadParm()
samba_lp.load_default()
self.assertEquals(None,
self.assertEqual(None,
samba_lp.dump_a_parameter('interfaces',
'global',
self.tempf))