Use assertEqual instead of deprecated assertEquals

certbot-apache/certbot_apache/tests/configurator_test.py

@@ -56,7 +56,7 @@ class MultipleVhostsTest(util.ApacheTest):
         mock_surgery.return_value = False
         with mock.patch.dict('os.environ', silly_path):
             self.assertRaises(errors.NoInstallationError, self.config.prepare)
-            self.assertEquals(mock_surgery.call_count, 1)
+            self.assertEqual(mock_surgery.call_count, 1)
 
     @mock.patch("certbot_apache.augeas_configurator.AugeasConfigurator.init_augeas")
     def test_prepare_no_augeas(self, mock_init_augeas):
@@ -1242,8 +1242,8 @@ class MultipleVhostsTest(util.ApacheTest):
         mock_match = mock.Mock(return_value=["something"])
         self.config.aug.match = mock_match
         # pylint: disable=protected-access
-        self.assertEquals(self.config._check_aug_version(),
-                          ["something"])
+        self.assertEqual(self.config._check_aug_version(),
+                         ["something"])
         self.config.aug.match.side_effect = RuntimeError
         self.assertFalse(self.config._check_aug_version())
 

certbot-nginx/certbot_nginx/tests/configurator_test.py

@@ -37,8 +37,8 @@ class NginxConfiguratorTest(util.NginxTest):
             errors.NoInstallationError, self.config.prepare)
 
     def test_prepare(self):
-        self.assertEquals((1, 6, 2), self.config.version)
-        self.assertEquals(5, len(self.config.parser.parsed))
+        self.assertEqual((1, 6, 2), self.config.version)
+        self.assertEqual(5, len(self.config.parser.parsed))
 
     @mock.patch("certbot_nginx.configurator.util.exe_exists")
     @mock.patch("certbot_nginx.configurator.subprocess.Popen")
@@ -56,7 +56,7 @@ class NginxConfiguratorTest(util.NginxTest):
         self.config.version = None
         self.config.config_test = mock.Mock()
         self.config.prepare()
-        self.assertEquals((1, 6, 2), self.config.version)
+        self.assertEqual((1, 6, 2), self.config.version)
 
     @mock.patch("certbot_nginx.configurator.socket.gethostbyaddr")
     def test_get_all_names(self, mock_gethostbyaddr):

certbot-nginx/certbot_nginx/tests/nginxparser_test.py

@@ -134,8 +134,8 @@ class TestRawNginxParser(unittest.TestCase):
             parsed_new = load(handle)
         try:
             self.maxDiff = None
-            self.assertEquals(parsed[0], parsed_new[0])
-            self.assertEquals(parsed[1:], parsed_new[1:])
+            self.assertEqual(parsed[0], parsed_new[0])
+            self.assertEqual(parsed[1:], parsed_new[1:])
         finally:
             os.unlink(util.get_data_filename('nginx.new.conf'))
 
@@ -150,7 +150,7 @@ class TestRawNginxParser(unittest.TestCase):
             parsed_new = load(handle)
 
         try:
-            self.assertEquals(parsed, parsed_new)
+            self.assertEqual(parsed, parsed_new)
 
             self.assertEqual(parsed_new, [
                 ['#', " Use bar.conf when it's a full moon!"],

certbot-nginx/certbot_nginx/tests/parser_test.py

@@ -117,9 +117,9 @@ class NginxParserTest(util.NginxTest):
         fooconf = [x for x in vhosts if 'foo.conf' in x.filep][0]
         self.assertEqual(vhost5, fooconf)
         localhost = [x for x in vhosts if 'localhost' in x.names][0]
-        self.assertEquals(vhost1, localhost)
+        self.assertEqual(vhost1, localhost)
         somename = [x for x in vhosts if 'somename' in x.names][0]
-        self.assertEquals(vhost2, somename)
+        self.assertEqual(vhost2, somename)
 
     def test_add_server_directives(self):
         nparser = parser.NginxParser(self.config_path, self.ssl_options)

certbot/plugins/util_test.py

@@ -16,15 +16,15 @@ class PathSurgeryTest(unittest.TestCase):
         with mock.patch.dict('os.environ', all_path):
             with mock.patch('certbot.util.exe_exists') as mock_exists:
                 mock_exists.return_value = True
-                self.assertEquals(path_surgery("eg"), True)
-                self.assertEquals(mock_debug.call_count, 0)
-                self.assertEquals(mock_warn.call_count, 0)
-                self.assertEquals(os.environ["PATH"], all_path["PATH"])
+                self.assertEqual(path_surgery("eg"), True)
+                self.assertEqual(mock_debug.call_count, 0)
+                self.assertEqual(mock_warn.call_count, 0)
+                self.assertEqual(os.environ["PATH"], all_path["PATH"])
         no_path = {"PATH": "/tmp/"}
         with mock.patch.dict('os.environ', no_path):
             path_surgery("thingy")
-            self.assertEquals(mock_debug.call_count, 1)
-            self.assertEquals(mock_warn.call_count, 1)
+            self.assertEqual(mock_debug.call_count, 1)
+            self.assertEqual(mock_warn.call_count, 1)
             self.assertTrue("Failed to find" in mock_warn.call_args[0][0])
             self.assertTrue("/usr/local/bin" in os.environ["PATH"])
             self.assertTrue("/tmp" in os.environ["PATH"])