Refactoring: Replace test_prefix_list variables with TestBaselineSet objects.

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 the current CL."""
 
 import json
 import logging
 import optparse
 
 from webkitpy.common.net.git_cl import GitCL
-from webkitpy.tool.commands.rebaseline import AbstractParallelRebaselineCommand
+from webkitpy.tool.commands.rebaseline import AbstractParallelRebaselineCommand, TestBaselineSet
 from webkitpy.w3c.wpt_manifest import WPTManifest
 
 _log = logging.getLogger(__name__)
 
 
 class RebaselineCL(AbstractParallelRebaselineCommand):
     name = 'rebaseline-cl'
     help_text = 'Fetches new baselines for a CL from test runs on try bots.'
     long_help = ('By default, this command will check the latest try job results '
                  'for all platforms, and start try jobs for platforms with no '
@@ skipping 56 matching lines @@
             _log.error('The following builders have no results:')
             for builder in builders_with_no_results:
                 _log.error('  %s', builder)
             return 1
 
         _log.debug('Getting results for issue %d.', issue_number)
         builds_to_results = self._fetch_results(builds)
         if builds_to_results is None:
             return 1
 
-        test_prefix_list = {}
+        test_baseline_set = TestBaselineSet(tool)
         if args:
             for test in args:
-                test_prefix_list[test] = builds
+                for build in builds:
+                    test_baseline_set.add(test, build)
         else:
-            test_prefix_list = self._test_prefix_list(
+            test_baseline_set = self._make_test_baseline_set(
                 builds_to_results,
                 only_changed_tests=options.only_changed_tests)
 
-        self._log_test_prefix_list(test_prefix_list)
+        _log.debug('Rebaselining: %s', test_baseline_set)
 
         if not options.dry_run:
-            self.rebaseline(options, test_prefix_list)
+            self.rebaseline(options, test_baseline_set)
         return 0
 
     def _get_issue_number(self):
         """Returns the current CL issue number, or None."""
         issue = self.git_cl().get_issue_number()
         if not issue.isdigit():
             return None
         return int(issue)
 
     def git_cl(self):
@@ skipping 41 matching lines @@
             results_url = buildbot.results_url(build.builder_name, build.build_number)
             layout_test_results = buildbot.fetch_results(build)
             if layout_test_results is None:
                 _log.error('Failed to fetch results for: %s', build)
                 _log.error('Results were expected to exist at:\n%s/results.html', results_url)
                 _log.error('If the job failed, you could retry by running:\ngit cl try -b %s', build.builder_name)
                 return None
             results[build] = layout_test_results
         return results
 
-    def _test_prefix_list(self, builds_to_results, only_changed_tests):
+    def _make_test_baseline_set(self, builds_to_results, only_changed_tests):
         """Returns a dict which lists the set of baselines to fetch.
 
         The dict that is returned is a dict of tests to Build objects
         to baseline file extensions.
 
         Args:
             builds_to_results: A dict mapping Builds to LayoutTestResults.
             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.
 
         Returns:
             A dict containing information about which new baselines to download.
         """
         builds_to_tests = {}
         for build, results in builds_to_results.iteritems():
             builds_to_tests[build] = self._tests_to_rebaseline(build, results)
         if only_changed_tests:
             files_in_cl = self._tool.git().changed_files(diff_filter='AM')
             # In the changed files list from Git, paths always use "/" as
             # the path separator, and they're always relative to repo root.
             # TODO(qyearsley): Do this without using a hard-coded constant.
             test_base = 'third_party/WebKit/LayoutTests/'
             tests_in_cl = [f[len(test_base):] for f in files_in_cl if f.startswith(test_base)]
-        result = {}
+
+        test_baseline_set = TestBaselineSet(self._tool)
         for build, tests in builds_to_tests.iteritems():
             for test in tests:
                 if only_changed_tests and test not in tests_in_cl:
                     continue
-                if test not in result:
-                    result[test] = []
-                result[test].append(build)
-        return result
+                test_baseline_set.add(test, build)
+        return test_baseline_set
 
     def _tests_to_rebaseline(self, build, layout_test_results):
         """Fetches a list of tests that should be rebaselined for some build."""
         unexpected_results = layout_test_results.didnt_run_as_expected_results()
         tests = sorted(r.test_name() for r in unexpected_results
                        if r.is_missing_baseline() or r.has_mismatch_result())
 
         new_failures = self._fetch_tests_with_new_failures(build)
         if new_failures is None:
             _log.warning('No retry summary available for build %s.', build)
         else:
             tests = [t for t in tests if t in new_failures]
         return tests
 
     def _fetch_tests_with_new_failures(self, build):
         """For a given try job, lists tests that only occurred with the patch."""
         buildbot = self._tool.buildbot
         content = buildbot.fetch_retry_summary_json(build)
         if content is None:
             return None
         try:
             retry_summary = json.loads(content)
             return retry_summary['failures']
         except (ValueError, KeyError):
             _log.warning('Unexpected retry summary content:\n%s', content)
             return None
-
-    @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.debug('Tests to rebaseline:')
-        for test, builds in test_prefix_list.iteritems():
-            _log.debug('  %s:', test)
-            for build in sorted(builds):
-                _log.debug('    %s', build)