Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: tools/memory_inspector/PRESUBMIT.py

Issue 538363006: [Android] memory_inspector: revert accidental changes to PRESUBMIT.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/memory_inspector/PRESUBMIT.py
diff --git a/tools/memory_inspector/PRESUBMIT.py b/tools/memory_inspector/PRESUBMIT.py
index d25d05a3645deaf7fc062cfcc4866e759b44bee7..5d0e21e3d35ec130486171526ef8518fef52cd38 100644
--- a/tools/memory_inspector/PRESUBMIT.py
+++ b/tools/memory_inspector/PRESUBMIT.py
@@ -9,7 +9,7 @@ details on the presubmit API built into gcl.
"""
-def _CommonChecks(input_api, output_api):
+def CommonChecks(input_api, output_api):
output = []
blacklist = [r'classification_rules.*']
output.extend(input_api.canned_checks.RunPylint(
@@ -30,46 +30,9 @@ def _CommonChecks(input_api, output_api):
return output
-def _CheckPrebuiltsAreUploaded(input_api, output_api):
- import sys
- import urllib2
- old_sys_path = sys.path
- try:
- sys.path.append(input_api.os_path.join(input_api.PresubmitLocalPath()))
- from memory_inspector import constants
- finally:
- sys.path = old_sys_path
- missing_files = []
- for f in input_api.os_listdir(constants.PREBUILTS_PATH):
- if not f.endswith('.sha1'):
- continue
- prebuilt_sha_path = input_api.os_path.join(constants.PREBUILTS_PATH, f)
- with open(prebuilt_sha_path) as sha_file:
- sha = sha_file.read().strip()
- url = constants.PREBUILTS_BASE_URL + sha
- request = urllib2.Request(url)
- request.get_method = lambda : 'HEAD'
- try:
- urllib2.urlopen(request)
- except Exception, e:
- if isinstance(e, urllib2.HTTPError) and e.code == 404:
- missing_files += [prebuilt_sha_path]
- else:
- return [output_api.PresubmitError('HTTP Error while checking %s' % url,
- long_text=str(e))]
- if missing_files:
- return [output_api.PresubmitError(
- 'Some prebuilts have not been uploaded. Perhaps you forgot to '
- 'upload_to_google_storage.py?', missing_files)]
- return []
-
-
def CheckChangeOnUpload(input_api, output_api):
- results = []
- results.extend(_CommonChecks(input_api, output_api))
- results.extend(_CheckPrebuiltsAreUploaded(input_api, output_api))
- return results
+ return CommonChecks(input_api, output_api)
def CheckChangeOnCommit(input_api, output_api):
- return _CommonChecks(input_api, output_api)
+ return CommonChecks(input_api, output_api)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698