Add content addressed uploading helper function for render tests.

build/android/pylib/local/device/local_device_instrumentation_test_run.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 import posixpath
 import re
 import sys
 import tempfile
@@ skipping 529 matching lines @@
         device.PullFile(diff_images_device_dir, temp_dir)
       else:
         logging.error('Diff images not found on device.')
 
       if device.FileExists(golden_images_device_dir):
         device.PullFile(golden_images_device_dir, temp_dir)
       else:
         logging.error('Golden images not found on device.')
 
       for failure_filename in os.listdir(os.path.join(temp_dir, 'failures')):
-
         m = RE_RENDER_IMAGE_NAME.match(failure_filename)
         if not m:
           logging.warning('Unexpected file in render test failures: %s',
                           failure_filename)
           continue
 
         failure_filepath = os.path.join(temp_dir, 'failures', failure_filename)
-        failure_link = google_storage_helper.upload(
-            google_storage_helper.unique_name(
-                'failure_%s' % failure_filename, device=device),
-            failure_filepath,
-            bucket=render_tests_bucket)
+        failure_link = google_storage_helper.upload_content_addressed(
+            failure_filepath, bucket=render_tests_bucket)
 
         golden_filepath = os.path.join(temp_dir, 'goldens', failure_filename)
         if os.path.exists(golden_filepath):
-          golden_link = google_storage_helper.upload(
-              google_storage_helper.unique_name(
-                  'golden_%s' % failure_filename, device=device),
-              golden_filepath,
-              bucket=render_tests_bucket)
+          golden_link = google_storage_helper.upload_content_addressed(
+              golden_filepath, bucket=render_tests_bucket)
         else:
           golden_link = ''
 
         diff_filepath = os.path.join(temp_dir, 'diffs', failure_filename)
         if os.path.exists(diff_filepath):
-          diff_link = google_storage_helper.upload(
-              google_storage_helper.unique_name(
-                  'diff_%s' % failure_filename, device=device),
-              diff_filepath,
-              bucket=render_tests_bucket)
+          diff_link = google_storage_helper.upload_content_addressed(
+              diff_filepath, bucket=render_tests_bucket)
         else:
           diff_link = ''
 
         with tempfile.NamedTemporaryFile(suffix='.html') as temp_html:
           jinja2_env = jinja2.Environment(
               loader=jinja2.FileSystemLoader(_JINJA_TEMPLATE_DIR),
               trim_blocks=True)
           template = jinja2_env.get_template(_JINJA_TEMPLATE_FILENAME)
           # pylint: disable=no-member
           processed_template_output = template.render(
               failure_link=failure_link,
               golden_link=golden_link,
               diff_link=diff_link)
 
           temp_html.write(processed_template_output)
           temp_html.flush()
-          html_results_link = google_storage_helper.upload(
-              google_storage_helper.unique_name('render_html', device=device),
+          html_results_link = google_storage_helper.upload_content_addressed(
               temp_html.name,
               bucket=render_tests_bucket,
               content_type='text/html')
           for result in results:
             result.SetLink(failure_filename, html_results_link)
 
   #override
   def _ShouldRetry(self, test):
     if 'RetryOnFailure' in test.get('annotations', {}):
       return True
@@ skipping 27 matching lines @@
 
     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
 
     return timeout
 
 def _IsRenderTest(test):
   """Determines if a test or list of tests has a RenderTest amongst them."""
   if not isinstance(test, list):
     test = [test]
   return any([RENDER_TEST_FEATURE_ANNOTATION in t['annotations'].get(
-              FEATURE_ANNOTATION, ()) for t in test])
+              FEATURE_ANNOTATION, {}).get('value', ()) for t in test])