From e9342a723b81999d4514f1d10aef25a5a38a592f Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Mon, 14 Oct 2019 17:49:39 +0000 Subject: [PATCH] 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 Commit-Queue: Edward Lesmes Reviewed-by: Edward Lesmes --- tests/auth_test.py | 2 +- tests/bot_update_coverage_test.py | 16 +++++------ .../download_from_google_storage_unittest.py | 6 ++-- tests/fix_encoding_test.py | 12 ++++---- tests/git_cl_test.py | 28 +++++++++---------- tests/git_dates_test.py | 28 +++++++++---------- tests/git_rebase_update_test.py | 12 ++++---- tests/gsutil_test.py | 22 +++++++-------- tests/owners_unittest.py | 6 ++-- 9 files changed, 66 insertions(+), 66 deletions(-) diff --git a/tests/auth_test.py b/tests/auth_test.py index dded7a1d0..c70b36218 100755 --- a/tests/auth_test.py +++ b/tests/auth_test.py @@ -60,7 +60,7 @@ class TestLuciContext(auto_stub.TestCase): self._mock_loc_server_resp(200, json.dumps(resp_content)) params = auth._get_luci_context_local_auth_params() token = auth._get_luci_context_access_token(params, datetime.datetime.min) - self.assertEquals(token.token, 'token') + self.assertEqual(token.token, 'token') def test_no_account_id(self): self._mock_local_auth(None, 'secret', 8080) diff --git a/tests/bot_update_coverage_test.py b/tests/bot_update_coverage_test.py index cdb69b028..7e6eb3931 100755 --- a/tests/bot_update_coverage_test.py +++ b/tests/bot_update_coverage_test.py @@ -203,9 +203,9 @@ class BotUpdateUnittests(unittest.TestCase): idx_second_revision = args.index( '--revision', idx_first_revision+1) idx_third_revision = args.index('--revision', idx_second_revision+1) - self.assertEquals(args[idx_first_revision+1], 'somename@unmanaged') - self.assertEquals(args[idx_second_revision+1], 'src@origin/master') - self.assertEquals(args[idx_third_revision+1], 'src/v8@deadbeef') + self.assertEqual(args[idx_first_revision+1], 'somename@unmanaged') + self.assertEqual(args[idx_second_revision+1], 'src@origin/master') + self.assertEqual(args[idx_third_revision+1], 'src/v8@deadbeef') return self.call.records def testApplyPatchOnGclient(self): @@ -280,17 +280,17 @@ class BotUpdateUnittests(unittest.TestCase): } } out = bot_update.create_manifest(gclient_output, None) - self.assertEquals(len(out['directories']), 2) - self.assertEquals( + self.assertEqual(len(out['directories']), 2) + self.assertEqual( out['directories']['src']['git_checkout']['revision'], 'f671d3baeb64d9dba628ad582e867cf1aebc0207') - self.assertEquals( + self.assertEqual( out['directories']['src']['git_checkout']['repo_url'], 'https://chromium.googlesource.com/chromium/src') - self.assertEquals( + self.assertEqual( out['directories']['breakpad']['git_checkout']['revision'], '5f638d532312685548d5033618c8a36f73302d0a') - self.assertEquals( + self.assertEqual( out['directories']['breakpad']['git_checkout']['repo_url'], 'https://chromium.googlesource.com/breakpad') self.assertNotIn('src/overridden', out['directories']) diff --git a/tests/download_from_google_storage_unittest.py b/tests/download_from_google_storage_unittest.py index c30db9396..9cecacadc 100755 --- a/tests/download_from_google_storage_unittest.py +++ b/tests/download_from_google_storage_unittest.py @@ -397,9 +397,9 @@ class DownloadTests(unittest.TestCase): self.assertTrue(q.empty()) msg = ('1> ERROR remote sha1 (%s) does not match expected sha1 (%s).' % ('8843d7f92416211de9ebb963ff4ce28125932878', sha1_hash)) - self.assertEquals(out_q.get(), '1> Downloading %s...' % output_filename) - self.assertEquals(out_q.get(), msg) - self.assertEquals(ret_codes.get(), (20, msg)) + self.assertEqual(out_q.get(), '1> Downloading %s...' % output_filename) + self.assertEqual(out_q.get(), msg) + self.assertEqual(ret_codes.get(), (20, msg)) self.assertTrue(out_q.empty()) self.assertTrue(ret_codes.empty()) diff --git a/tests/fix_encoding_test.py b/tests/fix_encoding_test.py index 9f8985fc1..e443f5848 100755 --- a/tests/fix_encoding_test.py +++ b/tests/fix_encoding_test.py @@ -37,7 +37,7 @@ class FixEncodingTest(unittest.TestCase): print(self.text, file=sys.stderr) def test_default_encoding(self): - self.assertEquals('utf-8', sys.getdefaultencoding()) + self.assertEqual('utf-8', sys.getdefaultencoding()) def test_win_console(self): if sys.platform != 'win32': @@ -45,16 +45,16 @@ class FixEncodingTest(unittest.TestCase): # This should fail if not redirected, e.g. run directly instead of through # the presubmit check. Can be checked with: # python tests\fix_encoding_test.py - self.assertEquals( + self.assertEqual( sys.stdout.__class__, fix_encoding.WinUnicodeOutput) - self.assertEquals( + self.assertEqual( sys.stderr.__class__, fix_encoding.WinUnicodeOutput) - self.assertEquals(sys.stdout.encoding, sys.getdefaultencoding()) - self.assertEquals(sys.stderr.encoding, sys.getdefaultencoding()) + self.assertEqual(sys.stdout.encoding, sys.getdefaultencoding()) + self.assertEqual(sys.stderr.encoding, sys.getdefaultencoding()) def test_multiple_calls(self): # Shouldn't do anything. - self.assertEquals(False, fix_encoding.fix_encoding()) + self.assertEqual(False, fix_encoding.fix_encoding()) if __name__ == '__main__': diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index aeec60c0c..8cf43c07c 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -166,9 +166,9 @@ class TestGitClBasic(unittest.TestCase): cl.description = 'x' cl.has_description = True cl.FetchDescription = lambda *a, **kw: 'y' - self.assertEquals(cl.GetDescription(), 'x') - self.assertEquals(cl.GetDescription(force=True), 'y') - self.assertEquals(cl.GetDescription(), 'y') + self.assertEqual(cl.GetDescription(), 'x') + self.assertEqual(cl.GetDescription(force=True), 'y') + self.assertEqual(cl.GetDescription(), 'y') def test_description_footers(self): cl = git_cl.Changelist(issue=1, codereview_host='host') @@ -184,14 +184,14 @@ class TestGitClBasic(unittest.TestCase): cl.has_description = True cl.UpdateDescriptionRemote = lambda *a, **kw: 'y' msg, footers = cl.GetDescriptionFooters() - self.assertEquals( + self.assertEqual( msg, ['This is some message', '', 'It has some lines', 'and, also']) - self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')]) + self.assertEqual(footers, [('Some', 'Really'), ('Awesome', 'Footers')]) msg.append('wut') footers.append(('gnarly-dude', 'beans')) cl.UpdateDescriptionFooters(msg, footers) - self.assertEquals(cl.GetDescription().splitlines(), [ + self.assertEqual(cl.GetDescription().splitlines(), [ 'This is some message', '', 'It has some lines', @@ -667,7 +667,7 @@ class TestGitCl(TestCase): def tearDown(self): try: - self.assertEquals([], self.calls) + self.assertEqual([], self.calls) except AssertionError: if not self.has_failed(): raise @@ -1585,8 +1585,8 @@ class TestGitCl(TestCase): ret = git_cl.upload_branch_deps(MockChangelist(), []) # CMDupload should have been called 5 times because of 5 dependent branches. - self.assertEquals(5, record_calls.times_called) - self.assertEquals(0, ret) + self.assertEqual(5, record_calls.times_called) + self.assertEqual(0, ret) def test_gerrit_change_id(self): self.calls = [ @@ -2146,7 +2146,7 @@ class TestGitCl(TestCase): self.mock(git_cl.sys, 'stdout', out) def assertIssue(cl_self, *_args): - self.assertEquals(cl_self.issue, 1) + self.assertEqual(cl_self.issue, 1) return 'foobar' self.mock(git_cl.Changelist, 'GetDescription', assertIssue) @@ -2158,7 +2158,7 @@ class TestGitCl(TestCase): def test_SetCloseOverrideIssue(self): def assertIssue(cl_self, *_args): - self.assertEquals(cl_self.issue, 1) + self.assertEqual(cl_self.issue, 1) return 'foobar' self.mock(git_cl.Changelist, 'GetDescription', assertIssue) @@ -2204,7 +2204,7 @@ class TestGitCl(TestCase): current_desc = 'Some.\n\nChange-Id: xxx' def RunEditor(desc, _, **kwargs): - self.assertEquals( + self.assertEqual( '# Enter a description of the change.\n' '# This will be displayed on the codereview site.\n' '# The first line will also be used as the subject of the review.\n' @@ -2216,7 +2216,7 @@ class TestGitCl(TestCase): return 'Some.\n\nChange-Id: xxx\nBug: 123' def UpdateDescriptionRemote(_, desc, force=False): - self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123') + self.assertEqual(desc, 'Some.\n\nChange-Id: xxx\nBug: 123') self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) self.mock(git_cl.Changelist, 'GetDescription', @@ -2238,7 +2238,7 @@ class TestGitCl(TestCase): current_desc = 'Some.\n\nFixed: 123\nChange-Id: xxx' def RunEditor(desc, _, **kwargs): - self.assertEquals( + self.assertEqual( '# Enter a description of the change.\n' '# This will be displayed on the codereview site.\n' '# The first line will also be used as the subject of the review.\n' diff --git a/tests/git_dates_test.py b/tests/git_dates_test.py index 602baa56d..97e321b49 100755 --- a/tests/git_dates_test.py +++ b/tests/git_dates_test.py @@ -32,29 +32,29 @@ class GitDatesTest(GitDatesTestBase): expected_tz = self.git_dates.FixedOffsetTZ(datetime.timedelta(hours=11), '') expected = datetime.datetime(2016, 1, 25, 17, 25, 43, tzinfo=expected_tz) result = self.git_dates.timestamp_offset_to_datetime(timestamp, offset) - self.assertEquals(expected, result) - self.assertEquals(datetime.timedelta(hours=11), result.utcoffset()) - self.assertEquals('+1100', result.tzname()) - self.assertEquals(datetime.timedelta(0), result.dst()) + self.assertEqual(expected, result) + self.assertEqual(datetime.timedelta(hours=11), result.utcoffset()) + self.assertEqual('+1100', result.tzname()) + self.assertEqual(datetime.timedelta(0), result.dst()) offset = '-0800' expected_tz = self.git_dates.FixedOffsetTZ(datetime.timedelta(hours=-8), '') expected = datetime.datetime(2016, 1, 24, 22, 25, 43, tzinfo=expected_tz) result = self.git_dates.timestamp_offset_to_datetime(timestamp, offset) - self.assertEquals(expected, result) - self.assertEquals(datetime.timedelta(hours=-8), result.utcoffset()) - self.assertEquals('-0800', result.tzname()) - self.assertEquals(datetime.timedelta(0), result.dst()) + self.assertEqual(expected, result) + self.assertEqual(datetime.timedelta(hours=-8), result.utcoffset()) + self.assertEqual('-0800', result.tzname()) + self.assertEqual(datetime.timedelta(0), result.dst()) # Invalid offset. offset = '-08xx' expected_tz = self.git_dates.FixedOffsetTZ(datetime.timedelta(hours=0), '') expected = datetime.datetime(2016, 1, 25, 6, 25, 43, tzinfo=expected_tz) result = self.git_dates.timestamp_offset_to_datetime(timestamp, offset) - self.assertEquals(expected, result) - self.assertEquals(datetime.timedelta(hours=0), result.utcoffset()) - self.assertEquals('UTC', result.tzname()) - self.assertEquals(datetime.timedelta(0), result.dst()) + self.assertEqual(expected, result) + self.assertEqual(datetime.timedelta(hours=0), result.utcoffset()) + self.assertEqual('UTC', result.tzname()) + self.assertEqual(datetime.timedelta(0), result.dst()) # Offset out of range. offset = '+2400' @@ -64,12 +64,12 @@ class GitDatesTest(GitDatesTestBase): def testDatetimeString(self): tz = self.git_dates.FixedOffsetTZ(datetime.timedelta(hours=11), '') dt = datetime.datetime(2016, 1, 25, 17, 25, 43, tzinfo=tz) - self.assertEquals('2016-01-25 17:25:43 +1100', + self.assertEqual('2016-01-25 17:25:43 +1100', self.git_dates.datetime_string(dt)) tz = self.git_dates.FixedOffsetTZ(datetime.timedelta(hours=-8), '') dt = datetime.datetime(2016, 1, 24, 22, 25, 43, tzinfo=tz) - self.assertEquals('2016-01-24 22:25:43 -0800', + self.assertEqual('2016-01-24 22:25:43 -0800', self.git_dates.datetime_string(dt)) diff --git a/tests/git_rebase_update_test.py b/tests/git_rebase_update_test.py index e8d7d5f90..c2a8c5366 100755 --- a/tests/git_rebase_update_test.py +++ b/tests/git_rebase_update_test.py @@ -115,8 +115,8 @@ class GitRebaseUpdateTest(git_test_utils.GitRepoReadWriteTestBase): E F G A old_file """) - self.assertEquals(self.repo['A'], self.origin['A']) - self.assertEquals(self.repo['E'], self.origin['E']) + self.assertEqual(self.repo['A'], self.origin['A']) + self.assertEqual(self.repo['E'], self.origin['E']) with self.repo.open('bob', 'wb') as f: f.write('testing auto-freeze/thaw') @@ -158,7 +158,7 @@ class GitRebaseUpdateTest(git_test_utils.GitRepoReadWriteTestBase): self.assertIn('sub_K up-to-date', output) with self.repo.open('bob') as f: - self.assertEquals('testing auto-freeze/thaw', f.read()) + self.assertEqual('testing auto-freeze/thaw', f.read()) self.assertEqual(self.repo.git('status', '--porcelain').stdout, '?? bob\n') @@ -340,8 +340,8 @@ class GitRebaseUpdateTest(git_test_utils.GitRepoReadWriteTestBase): B C D E F G D foobar1 foobar2 """) - self.assertEquals(self.repo['A'], self.origin['A']) - self.assertEquals(self.repo['G'], self.origin['G']) + self.assertEqual(self.repo['A'], self.origin['A']) + self.assertEqual(self.repo['G'], self.origin['G']) output, _ = self.repo.capture_stdio(self.reup.main) self.assertIn('Fetching', output) @@ -349,7 +349,7 @@ class GitRebaseUpdateTest(git_test_utils.GitRepoReadWriteTestBase): self.assertIn('Rebasing: branch_K', output) self.assertIn('Rebasing: branch_L', output) self.assertIn('Rebasing: foobar', output) - self.assertEquals(self.repo.git('rev-parse', 'lkgr').stdout.strip(), + self.assertEqual(self.repo.git('rev-parse', 'lkgr').stdout.strip(), self.origin['M']) self.assertSchema(""" diff --git a/tests/gsutil_test.py b/tests/gsutil_test.py index d0fb8b029..888d0dbd0 100755 --- a/tests/gsutil_test.py +++ b/tests/gsutil_test.py @@ -90,10 +90,10 @@ class GsutilUnitTests(unittest.TestCase): 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 @@ class GsutilUnitTests(unittest.TestCase): 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 @@ class GsutilUnitTests(unittest.TestCase): 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 @@ class GsutilUnitTests(unittest.TestCase): 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__': diff --git a/tests/owners_unittest.py b/tests/owners_unittest.py index bc8478698..6aff93989 100755 --- a/tests/owners_unittest.py +++ b/tests/owners_unittest.py @@ -112,7 +112,7 @@ class OwnersDatabaseTest(_BaseTestCase): def assert_files_not_covered_by(self, files, reviewers, unreviewed_files): db = self.db() - self.assertEquals(db.files_not_covered_by(set(files), set(reviewers)), + self.assertEqual(db.files_not_covered_by(set(files), set(reviewers)), set(unreviewed_files)) def test_files_not_covered_by__owners_propagates_down(self): @@ -241,8 +241,8 @@ class OwnersDatabaseTest(_BaseTestCase): def test_mock_relpath(self): # This test ensures the mock relpath has the arguments in the right # order; this should probably live someplace else. - self.assertEquals(self.repo.relpath('foo/bar.c', 'foo/'), 'bar.c') - self.assertEquals(self.repo.relpath('/bar.c', '/'), 'bar.c') + self.assertEqual(self.repo.relpath('foo/bar.c', 'foo/'), 'bar.c') + self.assertEqual(self.repo.relpath('/bar.c', '/'), 'bar.c') def test_per_file_glob_across_dirs_not_allowed(self): self.files['/OWNERS'] = 'per-file content/*=john@example.org\n'