pytests: heed assertEquals deprecation warning en-masse

[samba.git] / python / samba / tests / common.py

diff --git a/python/samba/tests/common.py b/python/samba/tests/common.py
index 13f3ba2bc7ae9816138127f3fada95fae8a7b895..d326f795f85d24f668e37fc3ceaeb02013a709c2 100644 (file)
--- a/python/samba/tests/common.py
+++ b/python/samba/tests/common.py
@@ -27,18 +27,18 @@ from samba.samdb import SamDB
 class CommonTests(samba.tests.TestCaseInTempDir):
 
     def test_normalise_int32(self):
-        self.assertEquals('17', normalise_int32(17))
-        self.assertEquals('17', normalise_int32('17'))
-        self.assertEquals('-123', normalise_int32('-123'))
-        self.assertEquals('-1294967296', normalise_int32('3000000000'))
+        self.assertEqual('17', normalise_int32(17))
+        self.assertEqual('17', normalise_int32('17'))
+        self.assertEqual('-123', normalise_int32('-123'))
+        self.assertEqual('-1294967296', normalise_int32('3000000000'))
 
     def test_dsdb_Dn_binary(self):
         url = self.tempdir + "/test_dsdb_Dn_binary.ldb"
         sam = samba.Ldb(url=url)
         dn1 = dsdb_Dn(sam, "DC=foo,DC=bar")
         dn2 = dsdb_Dn(sam, "B:8:0000000D:<GUID=b3f0ec29-17f4-452a-b002-963e1909d101>;DC=samba,DC=example,DC=com")
-        self.assertEquals(dn2.binary, "0000000D")
-        self.assertEquals(13, dn2.get_binary_integer())
+        self.assertEqual(dn2.binary, "0000000D")
+        self.assertEqual(13, dn2.get_binary_integer())
         os.unlink(url)
 
     def test_dsdb_Dn_sorted(self):
@@ -53,14 +53,14 @@ class CommonTests(samba.tests.TestCaseInTempDir):
             dn6 = dsdb_Dn(sam, "<GUID=00000000-27f4-452a-b002-963e1909d101>;OU=dn6,DC=samba,DC=example,DC=com")
             unsorted_links14 = [dn1, dn2, dn3, dn4]
             sorted_vals14 = [str(dn) for dn in sorted(unsorted_links14)]
-            self.assertEquals(sorted_vals14[0], str(dn3))
-            self.assertEquals(sorted_vals14[1], str(dn2))
-            self.assertEquals(sorted_vals14[2], str(dn1))
-            self.assertEquals(sorted_vals14[3], str(dn4))
+            self.assertEqual(sorted_vals14[0], str(dn3))
+            self.assertEqual(sorted_vals14[1], str(dn2))
+            self.assertEqual(sorted_vals14[2], str(dn1))
+            self.assertEqual(sorted_vals14[3], str(dn4))
             unsorted_links56 = [dn5, dn6]
             sorted_vals56 = [str(dn) for dn in sorted(unsorted_links56)]
-            self.assertEquals(sorted_vals56[0], str(dn6))
-            self.assertEquals(sorted_vals56[1], str(dn5))
+            self.assertEqual(sorted_vals56[0], str(dn6))
+            self.assertEqual(sorted_vals56[1], str(dn5))
         finally:
             del sam
             os.unlink(url)