InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Print the SHA of files downloaded from GS

Browse Source 
Bug: angleproject:4621
Change-Id: I85aefeeffa05712a63a62e9acef8df27b1933e34
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2190862
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
This commit is contained in:
Yuly Novikov
2020-05-08 19:46:56 +00:00
committed by LUCI CQ
parent 6afaa6ca97
commit 64dab2dbab
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
download_from_google_storage.py
View File

@@ -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.

14
tests/download_from_google_storage_unittest.py
View File

@@ -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())