commit 2d589a15d9800f640135ee05009f731f36f692bb
author Mike Frysinger <vapier@chromium.org> Sun Aug 25 14:15:12 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Sep 18 16:50:21 2019 +0000
tree a3f887c1785b67e49e1d9cd0c30f09e2cba91e75
parent 83d2cae04c5f4598f4e97765fa7db541210f4593

unittests: change self.assertEquals to self.assertEqual

The unittest module has deprecated the former name.

BUG=chromium:980619
TEST=`cros lint` is unchanged

Change-Id: I2b93cc6079d1bf49950ec0cdef7a4edcdf5535ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1810597
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

cli/deploy_unittest.py

diff --git a/cli/deploy_unittest.py b/cli/deploy_unittest.py
index b4c9515..2c69389 100644
--- a/cli/deploy_unittest.py
+++ b/cli/deploy_unittest.py
@@ -158,7 +158,7 @@
 
   def ValidatePkgs(self, actual, expected, constraints=None):
     # Containing exactly the same packages.
-    self.assertEquals(sorted(expected), sorted(actual))
+    self.assertEqual(sorted(expected), sorted(actual))
     # Packages appear in the right order.
     if constraints is not None:
       for needs, needed in constraints:
@@ -175,7 +175,7 @@
         self.device, '/', ['app1'], True, True, True)
     self.ValidatePkgs(installs, [app1])
     self.ValidatePkgs(listed, [app1])
-    self.assertEquals(num_updates, 1)
+    self.assertEqual(num_updates, 1)
 
   def testRunUpdatedBuildTime(self):
     self.SetupVartree(self._VARTREE)
@@ -188,7 +188,7 @@
         self.device, '/', ['app1'], True, True, True)
     self.ValidatePkgs(installs, [app1])
     self.ValidatePkgs(listed, [app1])
-    self.assertEquals(num_updates, 1)
+    self.assertEqual(num_updates, 1)
 
   def testRunExistingDepUpdated(self):
     self.SetupVartree(self._VARTREE)
@@ -202,7 +202,7 @@
         self.device, '/', ['app1'], True, True, True)
     self.ValidatePkgs(installs, [app1, app2], constraints=[(app1, app2)])
     self.ValidatePkgs(listed, [app1])
-    self.assertEquals(num_updates, 2)
+    self.assertEqual(num_updates, 2)
 
   def testRunMissingDepUpdated(self):
     self.SetupVartree(self._VARTREE)
@@ -217,7 +217,7 @@
         self.device, '/', ['app1'], True, True, True)
     self.ValidatePkgs(installs, [app1, app6], constraints=[(app1, app6)])
     self.ValidatePkgs(listed, [app1])
-    self.assertEquals(num_updates, 1)
+    self.assertEqual(num_updates, 1)
 
   def testRunExistingRevDepUpdated(self):
     self.SetupVartree(self._VARTREE)
@@ -232,7 +232,7 @@
         self.device, '/', ['app1'], True, True, True)
     self.ValidatePkgs(installs, [app1, app4], constraints=[(app4, app1)])
     self.ValidatePkgs(listed, [app1])
-    self.assertEquals(num_updates, 2)
+    self.assertEqual(num_updates, 2)
 
   def testRunMissingRevDepNotUpdated(self):
     self.SetupVartree(self._VARTREE)
@@ -246,7 +246,7 @@
         self.device, '/', ['app1'], True, True, True)
     self.ValidatePkgs(installs, [app1])
     self.ValidatePkgs(listed, [app1])
-    self.assertEquals(num_updates, 1)
+    self.assertEqual(num_updates, 1)
 
   def testRunTransitiveDepsUpdated(self):
     self.SetupVartree(self._VARTREE)
@@ -265,7 +265,7 @@
     self.ValidatePkgs(installs, [app1, app2, app4, app5],
                       constraints=[(app1, app2), (app4, app1), (app4, app5)])
     self.ValidatePkgs(listed, [app1])
-    self.assertEquals(num_updates, 4)
+    self.assertEqual(num_updates, 4)
 
   def testRunDisjunctiveDepsExistingUpdated(self):
     self.SetupVartree(self._VARTREE)
@@ -278,7 +278,7 @@
         self.device, '/', ['app1'], True, True, True)
     self.ValidatePkgs(installs, [app1])
     self.ValidatePkgs(listed, [app1])
-    self.assertEquals(num_updates, 1)
+    self.assertEqual(num_updates, 1)
 
   def testRunDisjunctiveDepsDefaultUpdated(self):
     self.SetupVartree(self._VARTREE)
@@ -292,7 +292,7 @@
         self.device, '/', ['app1'], True, True, True)
     self.ValidatePkgs(installs, [app1, app7], constraints=[(app1, app7)])
     self.ValidatePkgs(listed, [app1])
-    self.assertEquals(num_updates, 1)
+    self.assertEqual(num_updates, 1)
 
 
 class TestDeploy(cros_test_lib.ProgressBarTestCase):