Add an option to rebaseline.py to mark tests as ignore-failure.

tools/rebaseline.py

 #!/usr/bin/python
 
 '''
 Copyright 2012 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
@@ skipping 152 matching lines @@
   #           rebaseline whatever configs the JSON results summary file tells
   #           us to
   #  add_new: if True, add expectations for tests which don't have any yet
   #  bugs: optional list of bug numbers which pertain to these expectations
   #  notes: free-form text notes to add to all updated expectations
   #  mark_unreviewed: if True, mark these expectations as NOT having been
   #                   reviewed by a human; otherwise, leave that field blank.
   #                   Currently, there is no way to make this script mark
   #                   expectations as reviewed-by-human=True.
   #                   TODO(epoger): Add that capability to a review tool.
+  #  mark_ignore_failure: if True, mark failures of a given test as being
+  #                       ignored.
   def __init__(self, expectations_root, expectations_input_filename,
                expectations_output_filename, actuals_base_url,
                actuals_filename, exception_handler,
                tests=None, configs=None, add_new=False, bugs=None, notes=None,
-               mark_unreviewed=None, from_trybot=False):
+               mark_unreviewed=None, mark_ignore_failure=False,
+               from_trybot=False):
     self._expectations_root = expectations_root
     self._expectations_input_filename = expectations_input_filename
     self._expectations_output_filename = expectations_output_filename
     self._tests = tests
     self._configs = configs
     self._actuals_base_url = actuals_base_url
     self._actuals_filename = actuals_filename
     self._exception_handler = exception_handler
     self._add_new = add_new
     self._bugs = bugs
     self._notes = notes
     self._mark_unreviewed = mark_unreviewed
+    self._mark_ignore_failure = mark_ignore_failure;
     self._image_filename_re = re.compile(gm_json.IMAGE_FILENAME_PATTERN)
     self._using_svn = os.path.isdir(os.path.join(expectations_root, '.svn'))
     self._from_trybot = from_trybot
 
   # Executes subprocess.call(cmd).
   # Raises an Exception if the command fails.
   def _Call(self, cmd):
     if subprocess.call(cmd) != 0:
       raise _InternalException('error running command: ' + ' '.join(cmd))
 
@@ skipping 100 matching lines @@
             continue
         if not expected_results.get(image_name):
           expected_results[image_name] = {}
         expected_results[image_name]\
                         [gm_json.JSONKEY_EXPECTEDRESULTS_ALLOWEDDIGESTS]\
                         = [image_results]
         if self._mark_unreviewed:
           expected_results[image_name]\
                           [gm_json.JSONKEY_EXPECTEDRESULTS_REVIEWED]\
                           = False
+        if self._mark_ignore_failure:
+          expected_results[image_name]\
+                          [gm_json.JSONKEY_EXPECTEDRESULTS_IGNOREFAILURE]\
+                          = True
         if self._bugs:
           expected_results[image_name]\
                           [gm_json.JSONKEY_EXPECTEDRESULTS_BUGS]\
                           = self._bugs
         if self._notes:
           expected_results[image_name]\
                           [gm_json.JSONKEY_EXPECTEDRESULTS_NOTES]\
                           = self._notes
 
     # Write out updated expectations.
@@ skipping 71 matching lines @@
 parser.add_argument('--tests', metavar='TEST', nargs='+',
                     help=('which tests to rebaseline, e.g. '
                           '"--tests aaclip bigmatrix", as a filter over the '
                           'full set of results in ACTUALS_FILENAME; if '
                           'unspecified, rebaseline *all* tests that are '
                           'available.'))
 parser.add_argument('--unreviewed', action='store_true',
                     help=('mark all expectations modified by this run as '
                           '"%s": False' %
                           gm_json.JSONKEY_EXPECTEDRESULTS_REVIEWED))
+parser.add_argument('--ignore-failure', action='store_true',
+                    help=('mark all expectations modified by this run as '
+                          '"%s": True' %
+                          gm_json.JSONKEY_ACTUALRESULTS_FAILUREIGNORED))
 parser.add_argument('--from-trybot', action='store_true',
                     help=('pull the actual-results.json file from the '
                           'corresponding trybot, rather than the main builder'))
 args = parser.parse_args()
 exception_handler = ExceptionHandler(
     keep_going_on_failure=args.keep_going_on_failure)
 if args.builders:
   builders = args.builders
   missing_json_is_fatal = True
 else:
@@ skipping 12 matching lines @@
         expectations_root=args.expectations_root,
         expectations_input_filename=args.expectations_filename,
         expectations_output_filename=(args.expectations_filename_output or
                                       args.expectations_filename),
         tests=args.tests, configs=args.configs,
         actuals_base_url=args.actuals_base_url,
         actuals_filename=args.actuals_filename,
         exception_handler=exception_handler,
         add_new=args.add_new, bugs=args.bugs, notes=args.notes,
         mark_unreviewed=args.unreviewed,
+        mark_ignore_failure=args.ignore_failure,
         from_trybot=args.from_trybot)
     try:
       rebaseliner.RebaselineSubdir(builder=builder)
     except:
       exception_handler.RaiseExceptionOrContinue()
   else:
     try:
       raise _InternalException('expectations_json_file %s not found' %
                                expectations_json_file)
     except:
       exception_handler.RaiseExceptionOrContinue()
 
 exception_handler.ReportAllFailures()