Add --add-ignored option to rebaseline.py

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 145 matching lines @@
   #  actuals_base_url: base URL from which to read actual-result JSON files
   #  actuals_filename: filename (under actuals_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
   #  add_new: if True, add expectations for tests which don't have any yet
+  #  add_ignored: if True, add expectations for tests for which failures are
+  #               currently ignored
   #  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.
   #  from_trybot: if True, read actual-result JSON files generated from a
   #               trybot run rather than a waterfall run.
   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, mark_ignore_failure=False,
-               from_trybot=False):
+               tests=None, configs=None, add_new=False, add_ignored=False,
+               bugs=None, notes=None, 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._add_ignored = add_ignored
     self._bugs = bugs
     self._notes = notes
     self._mark_unreviewed = mark_unreviewed
     self._mark_ignore_failure = mark_ignore_failure;
     if self._tests or self._configs:
       self._image_filename_re = re.compile(gm_json.IMAGE_FILENAME_PATTERN)
     else:
       self._image_filename_re = None
     self._using_svn = os.path.isdir(os.path.join(expectations_root, '.svn'))
     self._from_trybot = from_trybot
@@ skipping 72 matching lines @@
     actuals_url = '/'.join([self._actuals_base_url, results_builder,
                             self._actuals_filename])
     # Only update results for tests that are currently failing.
     # We don't want to rewrite results for tests that are already succeeding,
     # because we don't want to add annotation fields (such as
     # JSONKEY_EXPECTEDRESULTS_BUGS) except for tests whose expectations we
     # are actually modifying.
     sections = [gm_json.JSONKEY_ACTUALRESULTS_FAILED]
     if self._add_new:
       sections.append(gm_json.JSONKEY_ACTUALRESULTS_NOCOMPARISON)
+    if self._add_ignored:
+      sections.append(gm_json.JSONKEY_ACTUALRESULTS_FAILUREIGNORED)
     results_to_update = self._GetActualResults(json_url=actuals_url,
                                                sections=sections)
 
     # Read in current expectations.
     expectations_input_filepath = os.path.join(
         self._expectations_root, builder, self._expectations_input_filename)
     expectations_dict = gm_json.LoadFromFile(expectations_input_filepath)
     expected_results = expectations_dict.get(gm_json.JSONKEY_EXPECTEDRESULTS)
     if not expected_results:
       expected_results = {}
@@ skipping 64 matching lines @@
 parser.add_argument('--actuals-filename',
                     help=('filename (within builder-specific subdirectories '
                           'of ACTUALS_BASE_URL) to read a summary of results '
                           'from; defaults to %(default)s'),
                     default='actual-results.json')
 parser.add_argument('--add-new', action='store_true',
                     help=('in addition to the standard behavior of '
                           'updating expectations for failing tests, add '
                           'expectations for tests which don\'t have '
                           'expectations yet.'))
+parser.add_argument('--add-ignored', action='store_true',
+                    help=('in addition to the standard behavior of '
+                          'updating expectations for failing tests, add '
+                          'expectations for tests for which failures are '
+                          'currently ignored.'))
 parser.add_argument('--bugs', metavar='BUG', type=int, nargs='+',
                     help=('Skia bug numbers (under '
                           'https://code.google.com/p/skia/issues/list ) which '
                           'pertain to this set of rebaselines.'))
 parser.add_argument('--builders', metavar='BUILDER', nargs='+',
                     help=('which platforms to rebaseline; '
                           'if unspecified, rebaseline all known platforms '
                           '(see below for a list)'))
 # TODO(epoger): Add test that exercises --configs argument.
 parser.add_argument('--configs', metavar='CONFIG', nargs='+',
@@ skipping 80 matching lines @@
   if os.path.isfile(expectations_json_file):
     rebaseliner = JsonRebaseliner(
         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,
+        add_new=args.add_new, add_ignored=args.add_ignored,
+        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()