rebaseline.py: add --keep-going-on-failure option, off by default

tools/rebaseline_imagefiles.py

 #!/usr/bin/python
 
 '''
 Copyright 2013 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
@@ skipping 35 matching lines @@
 class CommandFailedException(Exception):
     pass
 
 class ImageRebaseliner(object):
 
     # params:
     #  expectations_root: root directory of all expectations
     #  json_base_url: base URL from which to read json_filename
     #  json_filename: filename (under json_base_url) from which to read a
     #                 summary of results; typically "actual-results.json"
+    #  exception_handler: reference to rebaseline.ExceptionHandler object
     #  tests: list of tests to rebaseline, or None if we should rebaseline
     #         whatever files the JSON results summary file tells us to
     #  configs: which configs to run for each test, or None if we should
     #           rebaseline whatever configs the JSON results summary file tells
     #           us to
     #  dry_run: if True, instead of actually downloading files or adding
     #           files to checkout, display a list of operations that
     #           we would normally perform
     #  add_new: if True, add expectations for tests which don't have any yet
     #  missing_json_is_fatal: whether to halt execution if we cannot read a
     #                         JSON actual result summary file
     def __init__(self, expectations_root, json_base_url, json_filename,
-                 tests=None, configs=None, dry_run=False,
+                 exception_handler, tests=None, configs=None, dry_run=False,
                  add_new=False, missing_json_is_fatal=False):
         self._expectations_root = expectations_root
         self._tests = tests
         self._configs = configs
         self._json_base_url = json_base_url
         self._json_filename = json_filename
+        self._exception_handler = exception_handler
         self._dry_run = dry_run
         self._add_new = add_new
         self._missing_json_is_fatal = missing_json_is_fatal
         self._googlestorage_gm_actuals_root = (
             'http://chromium-skia-gm.commondatastorage.googleapis.com/gm')
         self._testname_pattern = re.compile('(\S+)_(\S+).png')
         self._is_svn_checkout = (
             os.path.exists(os.path.join(expectations_root, '.svn')) or
             os.path.exists(os.path.join(expectations_root, os.pardir, '.svn')))
         self._is_git_checkout = (
@@ skipping 162 matching lines @@
                 self._Call(cmd)
 
     # Rebaseline all tests/types we specified in the constructor,
     # within this gm-expectations subdir.
     #
     # params:
     #  subdir : e.g. 'base-shuttle-win7-intel-float'
     #  builder : e.g. 'Test-Win7-ShuttleA-HD2000-x86-Release'
     def RebaselineSubdir(self, subdir, builder):
         if not os.path.isdir(os.path.join(self._expectations_root, subdir)):
-            raise Exception((
+            self._exception_handler.RaiseExceptionOrContinue(Exception((
                 'Could not find "%s" subdir within expectations_root "%s".  ' +
                 'Are you sure --expectations-root is pointing at a valid ' +
-                'gm-expected directory?') % (subdir, self._expectations_root))
+                'gm-expected directory?') % (subdir, self._expectations_root)))
+            return
 
         json_url = '/'.join([self._json_base_url,
                              subdir, builder, subdir,
                              self._json_filename])
         all_results = self._GetActualResults(json_url=json_url)
         filenames = self._GetFilesToRebaseline(json_url=json_url,
                                                add_new=self._add_new)
         skipped_files = []
         for filename in filenames:
             (test, config) = self._testname_pattern.match(filename).groups()
             if self._tests:
                 if test not in self._tests:
                     skipped_files.append(filename)
                     continue
             if self._configs:
                 if config not in self._configs:
                     skipped_files.append(filename)
                     continue
             outfilename = os.path.join(self._expectations_root, subdir,
                                        filename);
-            # TODO(epoger): Until we resolve
-            # https://code.google.com/p/skia/issues/detail?id=1410 ('some GM
-            # result images not available for download from Google Storage'),
-            # keep going in the face of missing results for any one test.
             try:
                 self._RebaselineOneFile(expectations_subdir=subdir,
                                         builder_name=builder,
                                         infilename=filename,
                                         outfilename=outfilename,
                                         all_results=all_results)
-            except Exception as e:
-                print 'WARNING: swallowing exception %s' % e
+            except BaseException as e:
+                self._exception_handler.RaiseExceptionOrContinue(e)