From c10b7cb1e8d284f3d09559167751cd43c51d83dd Mon Sep 17 00:00:00 2001 From: Primiano Tucci Date: Tue, 16 Sep 2014 11:02:46 +0100 Subject: [Android] memory_inspector: revert accidental changes to PRESUBMIT.py PRESUBMIT.py ened up being accidentally part of the last patchset in crrev.com/549313006. It was not intended as it is still under review in crrev.com/562553003 BUG=340294 NOTRY=true TBR=primiano@chromium.org Review URL: https://codereview.chromium.org/538363006 Cr-Commit-Position: refs/heads/master@{#295037} --- tools/memory_inspector/PRESUBMIT.py | 43 +++---------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) (limited to 'tools/memory_inspector') diff --git a/tools/memory_inspector/PRESUBMIT.py b/tools/memory_inspector/PRESUBMIT.py index d25d05a..5d0e21e 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) -- cgit v1.1