DevTools: bail out presubmit early if error after node.js or formatting checks

third_party/WebKit/Source/devtools/PRESUBMIT.py

 # Copyright (C) 2014 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 14 matching lines @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """DevTools JSDoc validator presubmit script
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
 
+from collections import namedtuple
 import sys
 
 compile_note = "Be sure to run your patch by the compile_frontend.py script prior to committing!"
 
+CheckOutput = namedtuple('CheckOutput', ['results', 'has_errors'])
+
 
 def _CheckNodeAndNPMModules(input_api, output_api):
     node_script_path = input_api.os_path.join(input_api.PresubmitLocalPath(), "scripts", "install_node_deps.py")
     process = input_api.subprocess.Popen(
         [input_api.python_executable, node_script_path],
         stdout=input_api.subprocess.PIPE,
         stderr=input_api.subprocess.STDOUT)
     out, _ = process.communicate()
     if process.returncode != 0:
-        return [output_api.PresubmitError(out)]
-    return [output_api.PresubmitNotifyResult(out)]
+        return CheckOutput([output_api.PresubmitError(out)], has_errors=True)
+    return CheckOutput([output_api.PresubmitNotifyResult(out)], has_errors=False)
+
 
 def _FormatDevtools(input_api, output_api):
     affected_front_end_files = _getAffectedFrontEndFiles(input_api)
     if len(affected_front_end_files) == 0:
-        return []
+        return CheckOutput([], has_errors=False)
     original_sys_path = sys.path
     try:
         sys.path = sys.path + [input_api.os_path.join(input_api.PresubmitLocalPath(), "scripts")]
         import install_node_deps
     finally:
         sys.path = original_sys_path
 
     node_path, _ = install_node_deps.resolve_node_paths()
     format_path = input_api.os_path.join(input_api.PresubmitLocalPath(), "scripts", "format.js")
     glob_arg = "--glob=" + ",".join(affected_front_end_files)
     check_formatting_process = _inputPopen(input_api,
         args=[node_path, format_path] + [glob_arg, "--output-replacements-xml"])
     check_formatting_out, _ = check_formatting_process.communicate()
     if check_formatting_process.returncode != 0:
-        return [output_api.PresubmitError(check_formatting_out)]
+        return CheckOutput([output_api.PresubmitError(check_formatting_out)], has_errors=True)
     if "</replacement>" not in check_formatting_out:
-        return [output_api.PresubmitNotifyResult("CL is properly formatted")]
+        return CheckOutput([output_api.PresubmitNotifyResult("CL is properly formatted")], has_errors=False)
 
     format_args = [node_path, format_path] + [glob_arg]
     format_process = _inputPopen(input_api, format_args)
     format_process_out, _ = format_process.communicate()
 
     # Use eslint to autofix the braces
     eslint_path = input_api.os_path.join(input_api.PresubmitLocalPath(), "node_modules", ".bin", "eslint")
     eslint_process = _inputPopen(input_api,
         [node_path, eslint_path, '--no-eslintrc', '--fix', '--env=es6',
          '--rule={"curly": [2, "multi-or-nest", "consistent"]}']
                                  + affected_front_end_files)
     eslint_process.communicate()
 
     # Need to run clang-format again to align the braces
     reformat_process = _inputPopen(input_api, format_args)
     reformat_process.communicate()
 
-    return [output_api.PresubmitError("ERROR: Found formatting violations.\n"
+    return CheckOutput([output_api.PresubmitError("ERROR: Found formatting violations.\n"
                                       "Ran clang-format on files changed in CL\n"
                                       "Use git status to check the formatting changes"),
-            output_api.PresubmitError(format_process_out)]
+            output_api.PresubmitError(format_process_out)], has_errors=True)
 
 
 def _CheckDevtoolsStyle(input_api, output_api):
     affected_front_end_files = _getAffectedFrontEndFiles(input_api)
     if len(affected_front_end_files) > 0:
         lint_path = input_api.os_path.join(input_api.PresubmitLocalPath(),
                                            "scripts", "lint_javascript.py")
         process = input_api.subprocess.Popen(
             [input_api.python_executable, lint_path] + affected_front_end_files,
             stdout=input_api.subprocess.PIPE,
@@ skipping 92 matching lines @@
         for line_number, line in f.ChangedContents():
             if "/deep/" in line:
                 results.append(output_api.PresubmitError(("%s:%d uses /deep/ selector") % (f.LocalPath(), line_number)))
             if "::shadow" in line:
                 results.append(output_api.PresubmitError(("%s:%d uses ::shadow selector") % (f.LocalPath(), line_number)))
     return results
 
 
 def CheckChangeOnUpload(input_api, output_api):
     results = []
-    results.extend(_CheckNodeAndNPMModules(input_api, output_api))
-    results.extend(_FormatDevtools(input_api, output_api))
+
+    (node_results, has_errors) = _CheckNodeAndNPMModules(input_api, output_api)
+    results.extend(node_results)
+    if has_errors:
+        results.append(output_api.PresubmitError("ERROR: Bailed out early because error using node.js/npm"))
+        return results
+
+    (format_results, has_errors) = _FormatDevtools(input_api, output_api)
+    results.extend(format_results)
+    if has_errors:
+        results.append(output_api.PresubmitError("ERROR: Bailed out early because formatting errors were found"))
+        return results
+
     results.extend(_CheckDevtoolsStyle(input_api, output_api))
     results.extend(_CompileDevtoolsFrontend(input_api, output_api))
     results.extend(_CheckConvertSVGToPNGHashes(input_api, output_api))
     results.extend(_CheckOptimizePNGHashes(input_api, output_api))
     results.extend(_CheckCSSViolations(input_api, output_api))
     return results
 
 
 def CheckChangeOnCommit(input_api, output_api):
     return []
 
+
 def _getAffectedFrontEndFiles(input_api):
     local_paths = [f.AbsoluteLocalPath() for f in input_api.AffectedFiles() if f.Action() != "D"]
     devtools_root = input_api.PresubmitLocalPath()
     devtools_front_end = input_api.os_path.join(devtools_root, "front_end")
     affected_front_end_files = [file_name for file_name in local_paths if devtools_front_end in file_name and file_name.endswith(".js")]
     return [input_api.os_path.relpath(file_name, devtools_root) for file_name in affected_front_end_files]
 
+
 def _inputPopen(input_api, args):
     return input_api.subprocess.Popen(
         args,
         stdout=input_api.subprocess.PIPE,
         stderr=input_api.subprocess.STDOUT)