Raise Exception instead of failure when some steps fail.

master/skia_master_scripts/commands.py

 # Copyright (c) 2012 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.
 
 """Set of utilities to add commands to a buildbot factory.
 
 This is based on commands.py and adds skia-specific commands."""
 
 
 from buildbot.process.properties import WithProperties
@@ skipping 49 matching lines @@
             ]
     self.AddSlaveScript(script=self.PathJoin('utils', 'merge_into_svn.py'),
                         args=args, description=description, timeout=timeout,
                         is_upload_step=True,
                         is_rebaseline_step=is_rebaseline_step)
 
   def AddSlaveScript(self, script, args, description, timeout=None,
                      halt_on_failure=False, is_upload_step=False,
                      is_rebaseline_step=False, get_props_from_stdout=None,
                      workdir=None, do_step_if=None,
-                     always_run=False, flunk_on_failure=True):
+                     always_run=False, flunk_on_failure=True,
+                     exception_on_failure=False):
     """Run a slave-side Python script as its own build step."""
     if workdir:
       path_to_script = script
       use_workdir = workdir
     else:
       path_to_script = self.PathJoin(self._local_slave_script_dir, script)
       use_workdir = self.workdir
     self.AddRunCommand(command=['python', path_to_script] + args,
                        description=description, timeout=timeout,
                        halt_on_failure=halt_on_failure,
                        is_upload_step=is_upload_step,
                        is_rebaseline_step=is_rebaseline_step,
                        get_props_from_stdout=get_props_from_stdout,
                        workdir=use_workdir,
                        do_step_if=do_step_if,
                        always_run=always_run,
-                       flunk_on_failure=flunk_on_failure)
+                       flunk_on_failure=flunk_on_failure,
+                       exception_on_failure=exception_on_failure)
 
   def AddRunCommand(self, command, description='Run', timeout=None,
                     halt_on_failure=False, is_upload_step=False,
                     is_rebaseline_step=False, get_props_from_stdout=None,
                     workdir=None, do_step_if=None, always_run=False,
-                    flunk_on_failure=True):
+                    flunk_on_failure=True, exception_on_failure=False):
     """Runs an arbitrary command, perhaps a binary we built."""
     if not timeout:
       timeout = self.default_timeout
     self.factory.addStep(skia_build_step.SkiaBuildStep,
                          is_upload_step=is_upload_step,
                          is_rebaseline_step=is_rebaseline_step,
                          get_props_from_stdout=get_props_from_stdout,
                          description=description, timeout=timeout,
                          command=command, workdir=workdir or self.workdir,
                          env=self.environment_variables,
                          haltOnFailure=halt_on_failure,
                          doStepIf=do_step_if or skia_build_step.ShouldDoStep,
                          alwaysRun=always_run,
                          flunkOnFailure=flunk_on_failure,
+                         exception_on_failure=exception_on_failure,
                          hideStepIf=lambda s: s.isSkipped())
 
   def AddRunCommandList(self, command_list, description='Run', timeout=None,
                         halt_on_failure=False, is_upload_step=False,
                         is_rebaseline_step=False):
     """Runs a list of arbitrary commands."""
     # TODO(epoger): Change this so that build-step output shows each command
     # in the list separately--that will be a lot easier to follow.
     #
     # TODO(epoger): For now, this wraps the total command with WithProperties()
     # because *some* callers need it, and we can't use the string.join() command
     # to concatenate strings that have already been wrapped with
     # WithProperties().  Once I figure out how to make the build-step output
     # show each command separately, maybe I can remove this wrapper.
     self.AddRunCommand(command=WithProperties(' && '.join(command_list)),
                        description=description, timeout=timeout,
                        halt_on_failure=halt_on_failure,
                        is_upload_step=is_upload_step,
                        is_rebaseline_step=is_rebaseline_step)