Cleanup _CheckFormat presubmit check
The check was incorrectly excluding non-js files. Additionally, it can
use the _ExecuteSubProcess helper to remove duplicate logic for running
the sub-process.
Change-Id: I6435f91e1cee61b52581f6d76da3f0be3c8e9ee1
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2087768
Commit-Queue: Tim van der Lippe <[email protected]>
Reviewed-by: Jack Franklin <[email protected]>
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index d41fed4..4aa6024 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -33,6 +33,7 @@
"""
import sys
+import six
EXCLUSIVE_CHANGE_DIRECTORIES = [
[ 'third_party', 'v8' ],
@@ -44,8 +45,10 @@
def _ExecuteSubProcess(input_api, output_api, script_path, args, results):
- process = input_api.subprocess.Popen(
- [input_api.python_executable, script_path] + args, stdout=input_api.subprocess.PIPE, stderr=input_api.subprocess.STDOUT)
+ if isinstance(script_path, six.string_types):
+ script_path = [input_api.python_executable, script_path]
+
+ process = input_api.subprocess.Popen(script_path + args, stdout=input_api.subprocess.PIPE, stderr=input_api.subprocess.STDOUT)
out, _ = process.communicate()
if process.returncode != 0:
results.append(output_api.PresubmitError(out))
@@ -113,16 +116,8 @@
def _CheckFormat(input_api, output_api):
results = [output_api.PresubmitNotifyResult('Running Format Checks:')]
- def popen(args):
- return input_api.subprocess.Popen(args=args, stdout=input_api.subprocess.PIPE, stderr=input_api.subprocess.STDOUT)
- format_args = ['git', 'cl', 'format', '--js']
- format_process = popen(format_args)
- format_out, _ = format_process.communicate()
- if format_process.returncode != 0:
- results.append(output_api.PresubmitError(format_out))
-
- return results
+ return _ExecuteSubProcess(input_api, output_api, ['git', 'cl', 'format', '--js'], [], results)
def _CheckDevtoolsLocalization(input_api, output_api, check_all_files=False): # pylint: disable=invalid-name
@@ -312,21 +307,6 @@
return affected_files
-def _getAffectedFrontEndFiles(input_api):
- devtools_root = input_api.PresubmitLocalPath()
- devtools_front_end = input_api.os_path.join(devtools_root, 'front_end')
- affected_front_end_files = _getAffectedFiles(input_api, [devtools_front_end], ['D'], ['.js'])
- return [input_api.os_path.relpath(file_name, devtools_root) for file_name in affected_front_end_files]
-
-
-def _getAffectedJSFiles(input_api):
- devtools_root = input_api.PresubmitLocalPath()
- devtools_front_end = input_api.os_path.join(devtools_root, 'front_end')
- devtools_scripts = input_api.os_path.join(devtools_root, 'scripts')
- affected_js_files = _getAffectedFiles(input_api, [devtools_front_end, devtools_scripts], ['D'], ['.js'])
- return [input_api.os_path.relpath(file_name, devtools_root) for file_name in affected_js_files]
-
-
def _checkWithNodeScript(input_api, output_api, script_path, script_arguments=None): # pylint: disable=invalid-name
original_sys_path = sys.path
try:
