Add --from-trybot flag in rebaseline.py to enable rebaselining from trybots

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 73 matching lines @@
     'Test-Win7-ShuttleA-HD2000-x86-Debug',
     'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
     'Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite',
     'Test-Win7-ShuttleA-HD2000-x86-Release',
     'Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE',
     'Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite',
     'Test-Win7-ShuttleA-HD2000-x86_64-Debug',
     'Test-Win7-ShuttleA-HD2000-x86_64-Release',
 ]
 
+# TODO: Get this from builder_name_schema in buildbot.
+TRYBOT_SUFFIX = '-Trybot'
+
+
 class _InternalException(Exception):
   pass
 
 class ExceptionHandler(object):
   """ Object that handles exceptions, either raising them immediately or
   collecting them to display later on."""
 
   # params:
   def __init__(self, keep_going_on_failure=False):
     """
@@ skipping 59 matching lines @@
   #  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.
   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_unreviewed=None, 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._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))
 
   # Returns the full contents of filepath, as a single string.
   # If filepath looks like a URL, try to read it that way instead of as
   # a path on local storage.
@@ skipping 49 matching lines @@
     return results_to_return
 
   # Rebaseline all tests/types we specified in the constructor,
   # within this builder's subdirectory in expectations/gm .
   #
   # params:
   #  builder : e.g. 'Test-Win7-ShuttleA-HD2000-x86-Release'
   def RebaselineSubdir(self, builder):
     # Read in the actual result summary, and extract all the tests whose
     # results we need to update.
-    actuals_url = '/'.join([self._actuals_base_url,
-                            builder, self._actuals_filename])
+    results_builder = str(builder)
+    if self._from_trybot:
+      results_builder = results_builder + TRYBOT_SUFFIX
+    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)
     results_to_update = self._GetActualResults(json_url=actuals_url,
                                                sections=sections)
@@ skipping 111 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('--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:
   builders = sorted(TEST_BUILDERS)
   missing_json_is_fatal = False
 for builder in builders:
   if not builder in TEST_BUILDERS:
     raise Exception(('unrecognized builder "%s"; ' +
                      'should be one of %s') % (
                          builder, TEST_BUILDERS))
 
   expectations_json_file = os.path.join(args.expectations_root, builder,
                                         args.expectations_filename)
   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,
-        mark_unreviewed=args.unreviewed)
+        mark_unreviewed=args.unreviewed,
+        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()