pytests: heed assertEquals deprecation warning en-masse

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>

3 files changed, 25 insertions, 25 deletions

diff --git a/buildtools/wafsamba/tests/test_abi.py b/buildtools/wafsamba/tests/test_abi.py
index d6bdb041f72..8521c49d8e8 100644
--- a/buildtools/wafsamba/tests/test_abi.py
+++ b/buildtools/wafsamba/tests/test_abi.py
@@ -27,30 +27,30 @@ from samba.compat import StringIO
 class NormaliseSignatureTests(TestCase):
 
     def test_function_simple(self):
-        self.assertEquals("int (const struct GUID *, const struct GUID *)",
+        self.assertEqual("int (const struct GUID *, const struct GUID *)",
             normalise_signature("$2 = {int (const struct GUID *, const struct GUID *)} 0xe871 <GUID_compare>"))
 
     def test_maps_Bool(self):
         # Some types have different internal names
-        self.assertEquals("bool (const struct GUID *)",
+        self.assertEqual("bool (const struct GUID *)",
             normalise_signature("$1 = {_Bool (const struct GUID *)} 0xe75b <GUID_all_zero>"))
 
     def test_function_keep(self):
-        self.assertEquals(
+        self.assertEqual(
             "enum ndr_err_code (struct ndr_push *, int, const union winreg_Data *)",
             normalise_signature("enum ndr_err_code (struct ndr_push *, int, const union winreg_Data *)"))
 
     def test_struct_constant(self):
-        self.assertEquals(
+        self.assertEqual(
             'uuid = {time_low = 0, time_mid = 0, time_hi_and_version = 0, clock_seq = "\\000", node = "\\000\\000\\000\\000\\000"}, if_version = 0',
             normalise_signature('$239 = {uuid = {time_low = 0, time_mid = 0, time_hi_and_version = 0, clock_seq = "\\000", node = "\\000\\000\\000\\000\\000"}, if_version = 0}'))
 
     def test_incomplete_sequence(self):
         # Newer versions of gdb insert these incomplete sequence elements
-        self.assertEquals(
+        self.assertEqual(
             'uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\\237\\350", node = "\\b\\000+\\020H`"}, if_version = 2',
             normalise_signature('$244 = {uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\\237", <incomplete sequence \\350>, node = "\\b\\000+\\020H`"}, if_version = 2}'))
-        self.assertEquals(
+        self.assertEqual(
             'uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\\237\\350", node = "\\b\\000+\\020H`"}, if_version = 2',
             normalise_signature('$244 = {uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\\237\\350", node = "\\b\\000+\\020H`"}, if_version = 2}'))
 
@@ -62,7 +62,7 @@ class WriteVscriptTests(TestCase):
         abi_write_vscript(f, "MYLIB", "1.0", [], {
             "old": "1.0",
             "new": "1.0"}, ["*"])
-        self.assertEquals(f.getvalue(), """\
+        self.assertEqual(f.getvalue(), """\
 1.0 {
 \tglobal:
 \t\t*;
@@ -79,7 +79,7 @@ class WriteVscriptTests(TestCase):
         abi_write_vscript(f, "MYLIB", "1.0", ["0.1"], {
             "old": "0.1",
             "new": "1.0"}, ["*"])
-        self.assertEquals(f.getvalue(), """\
+        self.assertEqual(f.getvalue(), """\
 MYLIB_0.1 {
 \tglobal:
 \t\told;
@@ -101,7 +101,7 @@ MYLIB_0.1 {
             "exc_old": "0.1",
             "old": "0.1",
             "new": "1.0"}, ["!exc_*"])
-        self.assertEquals(f.getvalue(), """\
+        self.assertEqual(f.getvalue(), """\
 1.0 {
 \tglobal:
 \t\t*;
@@ -120,7 +120,7 @@ MYLIB_0.1 {
             "exc_bar": "1.0",
             "other": "1.0"
             }, ["pub_*", "!exc_*"])
-        self.assertEquals(f.getvalue(), """\
+        self.assertEqual(f.getvalue(), """\
 1.0 {
 \tglobal:
 \t\tpub_*;
diff --git a/buildtools/wafsamba/tests/test_bundled.py b/buildtools/wafsamba/tests/test_bundled.py
index c5f0db63cba..a8e982190d1 100644
--- a/buildtools/wafsamba/tests/test_bundled.py
+++ b/buildtools/wafsamba/tests/test_bundled.py
@@ -24,4 +24,4 @@ from wafsamba.samba_bundled import (
 class TuplizeVersionTests(TestCase):
 
     def test_simple(self):
-        self.assertEquals((1, 2, 10), tuplize_version("1.2.10"))
+        self.assertEqual((1, 2, 10), tuplize_version("1.2.10"))
diff --git a/buildtools/wafsamba/tests/test_utils.py b/buildtools/wafsamba/tests/test_utils.py
index a9578e25ae6..77fc55c0e52 100644
--- a/buildtools/wafsamba/tests/test_utils.py
+++ b/buildtools/wafsamba/tests/test_utils.py
@@ -26,33 +26,33 @@ from wafsamba.samba_utils import (
 class ToListTests(TestCase):
 
     def test_none(self):
-        self.assertEquals([], TO_LIST(None))
+        self.assertEqual([], TO_LIST(None))
 
     def test_already_list(self):
-        self.assertEquals(["foo", "bar", 1], TO_LIST(["foo", "bar", 1]))
+        self.assertEqual(["foo", "bar", 1], TO_LIST(["foo", "bar", 1]))
 
     def test_default_delimiter(self):
-        self.assertEquals(["foo", "bar"], TO_LIST("foo bar"))
-        self.assertEquals(["foo", "bar"], TO_LIST("  foo bar  "))
-        self.assertEquals(["foo ", "bar"], TO_LIST("  \"foo \" bar  "))
+        self.assertEqual(["foo", "bar"], TO_LIST("foo bar"))
+        self.assertEqual(["foo", "bar"], TO_LIST("  foo bar  "))
+        self.assertEqual(["foo ", "bar"], TO_LIST("  \"foo \" bar  "))
 
     def test_delimiter(self):
-        self.assertEquals(["foo", "bar"], TO_LIST("foo,bar", ","))
-        self.assertEquals(["  foo", "bar  "], TO_LIST("  foo,bar  ", ","))
-        self.assertEquals(["  \" foo\"", " bar  "], TO_LIST("  \" foo\", bar  ", ","))
+        self.assertEqual(["foo", "bar"], TO_LIST("foo,bar", ","))
+        self.assertEqual(["  foo", "bar  "], TO_LIST("  foo,bar  ", ","))
+        self.assertEqual(["  \" foo\"", " bar  "], TO_LIST("  \" foo\", bar  ", ","))
 
 
 class UniqueListTests(TestCase):
 
     def test_unique_list(self):
-        self.assertEquals(["foo", "bar"], unique_list(["foo", "bar", "foo"]))
+        self.assertEqual(["foo", "bar"], unique_list(["foo", "bar", "foo"]))
 
 
 class SubstVarsErrorTests(TestCase):
 
     def test_valid(self):
-        self.assertEquals("", subst_vars_error("", {}))
-        self.assertEquals("FOO bar", subst_vars_error("${F} bar", {"F": "FOO"}))
+        self.assertEqual("", subst_vars_error("", {}))
+        self.assertEqual("FOO bar", subst_vars_error("${F} bar", {"F": "FOO"}))
 
     def test_invalid(self):
         self.assertRaises(KeyError, subst_vars_error, "${F}", {})
@@ -63,14 +63,14 @@ class DictConcatTests(TestCase):
     def test_empty(self):
         ret = {}
         dict_concat(ret, {})
-        self.assertEquals({}, ret)
+        self.assertEqual({}, ret)
 
     def test_same(self):
         ret = {"foo": "bar"}
         dict_concat(ret, {"foo": "bla"})
-        self.assertEquals({"foo": "bar"}, ret)
+        self.assertEqual({"foo": "bar"}, ret)
 
     def test_simple(self):
         ret = {"foo": "bar"}
         dict_concat(ret, {"blie": "bla"})
-        self.assertEquals({"foo": "bar", "blie": "bla"}, ret)
+        self.assertEqual({"foo": "bar", "blie": "bla"}, ret)