rebaseline-cl: Don't trigger new try jobs for builders that already have jobs started.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py

 # Copyright 2016 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.
 
 """A command to fetch new baselines from try jobs for a Rietveld issue.
 
 This command interacts with the Rietveld API to get information about try jobs
 with layout test results.
 """
 
@@ skipping 38 matching lines @@
             self.results_directory_option,
         ])
         self.rietveld = Rietveld(Web())
 
     def execute(self, options, args, tool):
         self._tool = tool
         issue_number = self._get_issue_number(options)
         if not issue_number:
             return
 
-        builds = self.rietveld.latest_try_job_results(issue_number, self._try_bots())
+        builds = self.rietveld.latest_try_jobs(issue_number, self._try_bots())
         if options.trigger_jobs:
             if self.trigger_jobs_for_missing_builds(builds):
                 _log.info('Please re-run webkit-patch rebaseline-cl once all pending try jobs have finished.')
                 return
         if not builds:
-            # TODO(qyearsley): Also check that there are *finished* builds.
-            # The current behavior would still proceed if there are queued
-            # or started builds.
             _log.info('No builds to download baselines from.')
 
         if args:
             test_prefix_list = {}
             for test in args:
                 test_prefix_list[test] = {b: BASELINE_SUFFIX_LIST for b in builds}
         else:
             test_prefix_list = self._test_prefix_list(
                 issue_number, only_changed_tests=options.only_changed_tests)
 
@@ skipping 30 matching lines @@
                        'to operate on; please run `git cl upload` on this branch first, or use the --issue\n'
                        'option to download baselines for another existing CL.')
             return None
         return int(issue_number)
 
     def git_cl(self):
         """Returns a GitCL instance; can be overridden for tests."""
         return GitCL(self._tool)
 
     def trigger_jobs_for_missing_builds(self, builds):
-        """Returns True if jobs were triggered; False otherwise."""
+        """Triggers try jobs for any builders that have no builds started.
+
+        Args:
+          builds: A list of Build objects; if the build number of a Build is None,
+              then that indicates that the job is pending.
+
+        Returns:
+            True if there are pending jobs to wait for, including jobs just started.
+        """
         builders_with_builds = {b.builder_name for b in builds}
         builders_without_builds = set(self._try_bots()) - builders_with_builds
-        if not builders_without_builds:
-            return False
+        builders_with_pending_builds = {b.builder_name for b in builds if b.build_number is None}
 
-        _log.info('Triggering try jobs for:')
-        for builder in sorted(builders_without_builds):
-            _log.info('  %s', builder)
+        if builders_with_pending_builds:
+            _log.info('There are existing pending builds for:')
+            for builder in sorted(builders_with_pending_builds):
+                _log.info('  %s', builder)
 
-        # If the builders may be under different masters, then they cannot
-        # all be started in one invocation of git cl try without providing
-        # master names. Doing separate invocations is slower, but always works
-        # even when there are builders under different master names.
-        for builder in sorted(builders_without_builds):
-            self.git_cl().run(['try', '-b', builder])
-        return True
+        if builders_without_builds:
+            _log.info('Triggering try jobs for:')
+            for builder in sorted(builders_without_builds):
+                _log.info('  %s', builder)
+            # If the builders may be under different masters, then they cannot
+            # all be started in one invocation of git cl try without providing
+            # master names. Doing separate invocations is slower, but always works
+            # even when there are builders under different master names.
+            for builder in sorted(builders_without_builds):
+                self.git_cl().run(['try', '-b', builder])
+
+        return bool(builders_with_pending_builds or builders_without_builds)
 
     def _test_prefix_list(self, issue_number, only_changed_tests):
         """Returns a collection of test, builder and file extensions to get new baselines for.
 
         Args:
             issue_number: The CL number of the change which needs new baselines.
             only_changed_tests: Whether to only include baselines for tests that
                are changed in this CL. If False, all new baselines for failing
                tests will be downloaded, even for tests that were not modified.
 
@@ skipping 11 matching lines @@
                 if only_changed_tests and test not in tests_in_cl:
                     continue
                 if test not in result:
                     result[test] = {}
                 result[test][build] = BASELINE_SUFFIX_LIST
         return result
 
     def _builds_to_tests(self, issue_number):
         """Fetches a list of try bots, and for each, fetches tests with new baselines."""
         _log.debug('Getting results for Rietveld issue %d.', issue_number)
-        builds = self.rietveld.latest_try_job_results(issue_number, self._try_bots())
+        builds = self.rietveld.latest_try_jobs(issue_number, self._try_bots())
         if not builds:
             _log.debug('No try job results for builders in: %r.', self._try_bots())
         return {build: self._tests_to_rebaseline(build) for build in builds}
 
     def _try_bots(self):
         """Returns a collection of try bot builders to fetch results for."""
         return self._tool.builders.all_try_builder_names()
 
     def _tests_to_rebaseline(self, build):
         """Fetches a list of LayoutTestResult objects for unexpected results with new baselines."""
@@ skipping 10 matching lines @@
     @staticmethod
     def _log_test_prefix_list(test_prefix_list):
         """Logs the tests to download new baselines for."""
         if not test_prefix_list:
             _log.info('No tests to rebaseline; exiting.')
             return
         _log.info('Tests to rebaseline:')
         for test, builds in test_prefix_list.iteritems():
             builds_str = ', '.join(sorted('%s (%s)' % (b.builder_name, b.build_number) for b in builds))
             _log.info('  %s: %s', test, builds_str)