Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / test / gpu / page_sets / PRESUBMIT.py

diff --git a/src/content/test/gpu/page_sets/PRESUBMIT.py b/src/content/test/gpu/page_sets/PRESUBMIT.py
index 62bc2b4..d8e3842 100644 (file)
--- a/src/content/test/gpu/page_sets/PRESUBMIT.py
+++ b/src/content/test/gpu/page_sets/PRESUBMIT.py
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright (c) 2013 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.
 
@@ -6,69 +6,85 @@ import os
 import re
 import sys
 
+def _GetTelemetryPath(input_api):
+  return os.path.join(
+      os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(
+      input_api.PresubmitLocalPath())))), 'tools', 'telemetry')
 
-# Avoid leaking changes to global sys.path.
-_old_sys_path = sys.path
-try:
-  telemetry_dir = os.path.abspath(os.path.join(
-      os.pardir, os.pardir, os.pardir, os.pardir, 'tools', 'telemetry'))
-  sys.path.append(telemetry_dir)
-  from telemetry.page import cloud_storage
-finally:
-  sys.path = _old_sys_path
+def LoadSupport(input_api):
+  if 'cloud_storage' not in globals():
+    # Avoid leaking changes to global sys.path.
+    _old_sys_path = sys.path
+    try:
+      telemetry_path = _GetTelemetryPath(input_api)
+      sys.path = [telemetry_path] + sys.path
+      from telemetry.page import cloud_storage
+      globals()['cloud_storage'] = cloud_storage
+    finally:
+      sys.path = _old_sys_path
 
+  return globals()['cloud_storage']
 
-def _SyncFilesToCloud(input_api, output_api):
-  """Searches for .sha1 files and uploads them to Cloud Storage.
 
-  It validates all the hashes and skips upload if not necessary.
+def _GetFilesNotInCloud(input_api):
+  """Searches for .sha1 files and checks to see if they have already
+  been uploaded Cloud Storage. Returns a list of those that have not.
   """
-  # Look in both buckets, in case the user uploaded the file manually. But this
-  # script focuses on WPR archives, so it only uploads to the internal bucket.
-  hashes_in_cloud_storage = cloud_storage.List(cloud_storage.INTERNAL_BUCKET)
-  hashes_in_cloud_storage += cloud_storage.List(cloud_storage.PUBLIC_BUCKET)
-
-  results = []
+  hash_paths = []
   for affected_file in input_api.AffectedFiles(include_deletes=False):
     hash_path = affected_file.AbsoluteLocalPath()
-    file_path, extension = os.path.splitext(hash_path)
-    if extension != '.sha1':
-      continue
-
-    with open(hash_path, 'rb') as f:
-      file_hash = f.read(1024).rstrip()
-    if file_hash in hashes_in_cloud_storage:
-      results.append(output_api.PresubmitNotifyResult(
-          'File already in Cloud Storage, skipping upload: %s' % hash_path))
-      continue
-
-    if not re.match('^([A-Za-z0-9]{40})$', file_hash):
-      results.append(output_api.PresubmitError(
-          'Hash file does not contain a valid SHA-1 hash: %s' % hash_path))
-      continue
-    if not os.path.exists(file_path):
-      results.append(output_api.PresubmitError(
-          'Hash file exists, but file not found: %s' % hash_path))
-      continue
-    if cloud_storage.GetHash(file_path) != file_hash:
-      results.append(output_api.PresubmitError(
-          'Hash file does not match file\'s actual hash: %s' % hash_path))
-      continue
+    _, extension = os.path.splitext(hash_path)
+    if extension == '.sha1':
+      hash_paths.append(hash_path)
+  if not hash_paths:
+    return []
 
-    try:
-      cloud_storage.Insert(cloud_storage.INTERNAL_BUCKET, file_hash, file_path)
-      results.append(output_api.PresubmitNotifyResult(
-          'Uploaded file to Cloud Storage: %s' % hash_path))
-    except cloud_storage.CloudStorageError, e:
-      results.append(output_api.PresubmitError(
-          'Unable to upload to Cloud Storage: %s\n\n%s' % (hash_path, e)))
+  cloud_storage = LoadSupport(input_api)
+
+  # Look in both buckets, in case the user uploaded the file manually.
+  hashes_in_cloud_storage = cloud_storage.List(cloud_storage.PUBLIC_BUCKET)
+  try:
+    hashes_in_cloud_storage += cloud_storage.List(cloud_storage.INTERNAL_BUCKET)
+  except (cloud_storage.PermissionError, cloud_storage.CredentialsError):
+    pass
+
+  files = []
+  for hash_path in hash_paths:
+    file_hash = cloud_storage.ReadHash(hash_path)
+    if file_hash not in hashes_in_cloud_storage:
+      files.append((hash_path, file_hash))
+
+  return files
 
+
+def _VerifyFilesInCloud(input_api, output_api):
+  """Fails presubmit if any .sha1 files have not been previously uploaded to
+  Cloud storage.
+  """
+  results = []
+  hash_paths = _GetFilesNotInCloud(input_api)
+  file_paths = []
+  for hash_path, _ in hash_paths:
+    results.append(output_api.PresubmitError(
+        'Attemping to commit hash file, but corresponding '
+        'data file is not in Cloud Storage: %s' % hash_path))
+    file_paths.append(os.path.splitext(hash_path)[0])
+
+  if len(file_paths) > 0:
+    upload_script_path = os.path.join(
+        _GetTelemetryPath(input_api), 'cloud_storage')
+    results.append(output_api.PresubmitError(
+          'To upload missing files, Run: \n'
+          '%s upload %s google-only' %
+          (upload_script_path, ' '.join(file_paths))))
   return results
 
 
 def CheckChangeOnUpload(input_api, output_api):
-  return _SyncFilesToCloud(input_api, output_api)
+  results = _VerifyFilesInCloud(input_api, output_api)
+  return results
 
 
 def CheckChangeOnCommit(input_api, output_api):
-  return _SyncFilesToCloud(input_api, output_api)
+  results = _VerifyFilesInCloud(input_api, output_api)
+  return results