sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +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

10
python/samba/tests/smb.py
View File

@ -194,14 +194,14 @@ class SMBTests(samba.tests.TestCase):
self.smb_conn.savefile(test_file, test_contents.encode('utf8'))
contents = self.smb_conn.loadfile(test_file)
self.assertEquals(contents.decode('utf8'), test_contents,
self.assertEqual(contents.decode('utf8'), test_contents,
msg='contents of test file did not match what was written')
# check we can overwrite the file with new contents
new_contents = 'wxyz' * 128
self.smb_conn.savefile(test_file, new_contents.encode('utf8'))
contents = self.smb_conn.loadfile(test_file)
self.assertEquals(contents.decode('utf8'), new_contents,
self.assertEqual(contents.decode('utf8'), new_contents,
msg='contents of test file did not match what was written')
# with python2 this will save/load str type (with embedded nulls)
@ -210,7 +210,7 @@ class SMBTests(samba.tests.TestCase):
self.smb_conn.savefile(test_file, test_literal_bytes_embed_nulls)
contents = self.smb_conn.loadfile(test_file)
self.assertEquals(contents, test_literal_bytes_embed_nulls,
self.assertEqual(contents, test_literal_bytes_embed_nulls,
msg='contents of test file did not match what was written')
# python3 only this will save/load unicode
@ -219,7 +219,7 @@ class SMBTests(samba.tests.TestCase):
self.smb_conn.savefile(test_file, utf_contents.encode('utf8'))
contents = self.smb_conn.loadfile(test_file)
self.assertEquals(contents.decode('utf8'), utf_contents,
self.assertEqual(contents.decode('utf8'), utf_contents,
msg='contents of test file did not match what was written')
# with python2 this will save/load str type
@ -228,7 +228,7 @@ class SMBTests(samba.tests.TestCase):
self.smb_conn.savefile(test_file, binary_contents)
contents = self.smb_conn.loadfile(test_file)
self.assertEquals(contents, binary_contents,
self.assertEqual(contents, binary_contents,
msg='contents of test file did not match what was written')
def make_sysvol_path(self, dirpath, filename):