commit e9342a723b81999d4514f1d10aef25a5a38a592f
author Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> Mon Oct 14 17:49:39 2019 +0000
committer Commit Bot <commit-bot@chromium.org> Mon Oct 14 17:49:39 2019 +0000
tree e7dba03edc8b02c14ef50360589a9b61b2b5ea46
parent 2b034d469f80990a841c0770823d692c6c7b4444

Use assertEqual() rather than assertEquals() in Python tests.

The latter form is deprecated, and can generate extraneous output when
running the tests:

    DeprecationWarning: Please use assertEqual instead.

Bug: 984182, 1007872
Change-Id: Ibac81178e719a739560bbc65e0f6b9eda40b313a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1859995
Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>

tests/gsutil_test.py

diff --git a/tests/gsutil_test.py b/tests/gsutil_test.py
index d0fb8b0..888d0db 100755
--- a/tests/gsutil_test.py
+++ b/tests/gsutil_test.py
@@ -90,10 +90,10 @@
     url = '%s%s' % (gsutil.GSUTIL_URL, filename)
     self.fake.add_expectation(url, _returns=Buffer(fake_file))
 
-    self.assertEquals(
+    self.assertEqual(
         gsutil.download_gsutil(version, self.tempdir), full_filename)
     with open(full_filename, 'r') as f:
-      self.assertEquals(fake_file, f.read())
+      self.assertEqual(fake_file, f.read())
 
     metadata_url = gsutil.API_URL + filename
     md5_calc = hashlib.md5()
@@ -102,21 +102,21 @@
     self.fake.add_expectation(metadata_url, _returns=Buffer(json.dumps({
         'md5Hash': b64_md5
     })))
-    self.assertEquals(
+    self.assertEqual(
         gsutil.download_gsutil(version, self.tempdir), full_filename)
     with open(full_filename, 'r') as f:
-      self.assertEquals(fake_file, f.read())
-    self.assertEquals(self.fake.expectations, [])
+      self.assertEqual(fake_file, f.read())
+    self.assertEqual(self.fake.expectations, [])
 
     self.fake.add_expectation(metadata_url, _returns=Buffer(json.dumps({
         'md5Hash': base64.b64encode('aaaaaaa')  # Bad MD5
     })))
     self.fake.add_expectation(url, _returns=Buffer(fake_file2))
-    self.assertEquals(
+    self.assertEqual(
         gsutil.download_gsutil(version, self.tempdir), full_filename)
     with open(full_filename, 'r') as f:
-      self.assertEquals(fake_file2, f.read())
-    self.assertEquals(self.fake.expectations, [])
+      self.assertEqual(fake_file2, f.read())
+    self.assertEqual(self.fake.expectations, [])
 
   def test_ensure_gsutil_full(self):
     version = '4.2'
@@ -138,9 +138,9 @@
     gsutil.ensure_gsutil(version, self.tempdir, False)
     self.assertTrue(os.path.exists(gsutil_bin))
     with open(gsutil_bin, 'r') as f:
-      self.assertEquals(f.read(), fake_gsutil)
+      self.assertEqual(f.read(), fake_gsutil)
     self.assertTrue(os.path.exists(gsutil_flag))
-    self.assertEquals(self.fake.expectations, [])
+    self.assertEqual(self.fake.expectations, [])
 
   def test_ensure_gsutil_short(self):
     version = '4.2'
@@ -153,7 +153,7 @@
       f.write('Foobar')
     with open(gsutil_flag, 'w') as f:
       f.write('Barbaz')
-    self.assertEquals(
+    self.assertEqual(
         gsutil.ensure_gsutil(version, self.tempdir, False), gsutil_bin)
 
 if __name__ == '__main__':