From 64dab2dbab7ef956cd1a8cdfe3df54bb675ae943 Mon Sep 17 00:00:00 2001 From: Yuly Novikov Date: Fri, 8 May 2020 19:46:56 +0000 Subject: [PATCH] Print the SHA of files downloaded from GS Bug: angleproject:4621 Change-Id: I85aefeeffa05712a63a62e9acef8df27b1933e34 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2190862 Commit-Queue: Yuly Novikov Commit-Queue: Edward Lesmes Auto-Submit: Yuly Novikov Reviewed-by: Edward Lesmes --- download_from_google_storage.py | 3 ++- tests/download_from_google_storage_unittest.py | 14 ++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/download_from_google_storage.py b/download_from_google_storage.py index e6d85faf0c..afd18033da 100755 --- a/download_from_google_storage.py +++ b/download_from_google_storage.py @@ -284,7 +284,8 @@ def _downloader_worker_thread(thread_num, q, force, base_url, continue # Fetch the file. if verbose: - out_q.put('%d> Downloading %s...' % (thread_num, output_filename)) + out_q.put('%d> Downloading %s@%s...' % + (thread_num, output_filename, input_sha1_sum)) try: if delete: os.remove(output_filename) # Delete the file if it exists already. diff --git a/tests/download_from_google_storage_unittest.py b/tests/download_from_google_storage_unittest.py index 4fe58ac61d..978b545b24 100755 --- a/tests/download_from_google_storage_unittest.py +++ b/tests/download_from_google_storage_unittest.py @@ -262,13 +262,11 @@ class DownloadTests(unittest.TestCase): ('ls', input_filename)), ('check_call', ('cp', input_filename, output_filename))] + sha1_hash = '7871c8e24da15bad8b0be2c36edc9dc77e37727f' if sys.platform != 'win32': expected_calls.append( - ('check_call', - ('stat', - 'gs://sometesturl/7871c8e24da15bad8b0be2c36edc9dc77e37727f'))) - expected_output = [ - '0> Downloading %s...' % output_filename] + ('check_call', ('stat', 'gs://sometesturl/' + sha1_hash))) + expected_output = ['0> Downloading %s@%s...' % (output_filename, sha1_hash)] expected_ret_codes = [] self.assertEqual(list(stdout_queue.queue), expected_output) self.assertEqual(self.gsutil.history, expected_calls) @@ -313,8 +311,7 @@ class DownloadTests(unittest.TestCase): ('check_call', ('stat', 'gs://sometesturl/%s' % sha1_hash))) - expected_output = [ - '0> Downloading %s...' % output_filename] + expected_output = ['0> Downloading %s@%s...' % (output_filename, sha1_hash)] expected_output.extend([ '0> Extracting 3 entries from %s to %s' % (output_filename, output_dirname)]) @@ -400,7 +397,8 @@ class DownloadTests(unittest.TestCase): self.assertTrue(q.empty()) msg = ('1> ERROR remote sha1 (%s) does not match expected sha1 (%s).' % ('8843d7f92416211de9ebb963ff4ce28125932878', sha1_hash)) - self.assertEqual(out_q.get(), '1> Downloading %s...' % output_filename) + self.assertEqual(out_q.get(), + '1> Downloading %s@%s...' % (output_filename, sha1_hash)) self.assertEqual(out_q.get(), msg) self.assertEqual(ret_codes.get(), (20, msg)) self.assertTrue(out_q.empty())