Add support for rebaselining for a port from a non-corresponding builder.

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

 # Copyright (c) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 144 matching lines @@
         self._builder_names = set()
         self._test_prefix_map = collections.defaultdict(list)
 
     def __iter__(self):
         return iter(self._iter_combinations())
 
     def __bool__(self):
         return bool(self._test_prefix_map)
 
     def _iter_combinations(self):
-        """Iterates through (test, build) combinations."""
-        for test_prefix, builds in self._test_prefix_map.iteritems():
+        """Iterates through (test, build, port) combinations."""
+        for test_prefix, build_port_pairs in self._test_prefix_map.iteritems():
             for test in self._port.tests([test_prefix]):
-                for build in builds:
-                    yield (test, build)
+                for build, port_name in build_port_pairs:
+                    yield (test, build, port_name)
 
     def __str__(self):
         if not self._test_prefix_map:
             return '<Empty TestBaselineSet>'
-        return '<TestBaselineSet with:\n  ' + '\n  '.join('%s: %s' % pair for pair in self._iter_combinations()) + '>'
+        return ('<TestBaselineSet with:\n  ' +
+                '\n  '.join('%s: %s, %s' % triple for triple in self._iter_combinations()) +
+                '>')
 
-    def add(self, test_prefix, build):
+    def add(self, test_prefix, build, port_name=None):
         """Adds an entry for baselines to download for some set of tests.
 
         Args:
             test_prefix: This can be a full test path, or directory of tests, or a path with globs.
             build: A Build object. This specifies where to fetch baselines from.
+            port_name: This specifies what platform the baseline is for.
         """
+        port_name = port_name or self._host.builders.port_name_for_builder_name(build.builder_name)
         self._builder_names.add(build.builder_name)
-        self._test_prefix_map[test_prefix].append(build)
+        self._test_prefix_map[test_prefix].append((build, port_name))
 
     def all_builders(self):
         """Returns all builder names in in this collection."""
         return self._builder_names
 
 
 class CopyExistingBaselinesInternal(AbstractRebaseliningCommand):
     name = 'copy-existing-baselines-internal'
     help_text = ('Copy existing baselines down one level in the baseline order to ensure '
                  "new baselines don't break existing passing platforms.")
@@ skipping 239 matching lines @@
         return set(builders_to_fallback_paths)
 
     def _rebaseline_commands(self, test_baseline_set, options):
         path_to_webkit_patch = self._tool.path()
         cwd = self._tool.git().checkout_root
         copy_baseline_commands = []
         rebaseline_commands = []
         lines_to_remove = {}
 
         builders_to_fetch_from = self._builders_to_fetch_from(test_baseline_set.all_builders())
-        for test, build in test_baseline_set:
+        for test, build, port_name in test_baseline_set:
             if build.builder_name not in builders_to_fetch_from:
                 continue
 
-            port_name = self._tool.builders.port_name_for_builder_name(build.builder_name)
-
             suffixes = self._suffixes_for_actual_failures(test, build)
             if not suffixes:
                 # If we're not going to rebaseline the test because it's passing on this
                 # builder, we still want to remove the line from TestExpectations.
                 if test not in lines_to_remove:
                     lines_to_remove[test] = []
                 lines_to_remove[test].append(port_name)
                 continue
 
             args = []
@@ skipping 34 matching lines @@
                     _log.debug('"%s" is not a JSON object, ignoring', line)
             if not updated:
                 # TODO(qyearsley): This probably should be an error. See http://crbug.com/649412.
                 _log.debug('Could not add file based off output "%s"', stdout)
         return change_set
 
     def _optimize_baselines(self, test_baseline_set, verbose=False):
         """Returns a list of commands to run in parallel to de-duplicate baselines."""
         tests_to_suffixes = collections.defaultdict(set)
         builders_to_fetch_from = self._builders_to_fetch_from(test_baseline_set.all_builders())
-        for test, build in test_baseline_set:
+        for test, build, _ in test_baseline_set:
             if build.builder_name not in builders_to_fetch_from:
                 continue
             tests_to_suffixes[test].update(self._suffixes_for_actual_failures(test, build))
 
         optimize_commands = []
         for test, suffixes in tests_to_suffixes.iteritems():
             # No need to optimize baselines for a test with no failures.
             if not suffixes:
                 continue
             # FIXME: We should propagate the platform options as well.
@@ skipping 60 matching lines @@
 
         Args:
             options: An object with the command line options.
             test_baseline_set: A TestBaselineSet instance, which represents
                 a set of tests/platform combinations to rebaseline.
         """
         if self._tool.git().has_working_directory_changes(pathspec=self._layout_tests_dir()):
             _log.error('There are uncommitted changes in the layout tests directory; aborting.')
             return
 
-        for test in sorted({t for t, _ in test_baseline_set}):
+        for test in sorted({t for t, _, _ in test_baseline_set}):
             _log.info('Rebaselining %s', test)
 
         copy_baseline_commands, rebaseline_commands, extra_lines_to_remove = self._rebaseline_commands(
             test_baseline_set, options)
         lines_to_remove = {}
 
         self._run_in_parallel(copy_baseline_commands)
         lines_to_remove = self._run_in_parallel(rebaseline_commands)
 
         for test in extra_lines_to_remove:
@@ skipping 42 matching lines @@
         """Returns file paths for all baselines for the given tests and builders.
 
         Args:
             test_baseline_set: A TestBaselineSet instance.
 
         Returns:
             A list of absolute paths where baselines could possibly exist.
         """
         filesystem = self._tool.filesystem
         baseline_paths = set()
-        for test, build in test_baseline_set:
+        for test, build, _ in test_baseline_set:

[wkorman, 2017/04/03 20:41:52]

Is this ok re: we won't start doing multiples of tests where they are present in
duplicate test/build configs across ports? Similar for above.

[qyearsley, 2017/04/04 18:56:45]

Good idea to check this; right now it looks like it should be OK:
 - in _possible_baseline_paths, we're adding to a set, so duplicates shouldn't
be added.
 - in _optimize_baselines, we're updating an entry to a dictionary, and updating
multiple times should be OK.
 - in rebaseline, we're building a set, so duplicates shouldn't be added.

             filenames = [self._file_name_for_expected_result(test, suffix) for suffix in BASELINE_SUFFIX_LIST]
             port_baseline_dir = self._baseline_directory(build.builder_name)
             baseline_paths.update({filesystem.join(port_baseline_dir, filename) for filename in filenames})
             baseline_paths.update({filesystem.join(self._layout_tests_dir(), filename) for filename in filenames})
         return sorted(baseline_paths)
 
     def _layout_tests_dir(self):
         return self._tool.port_factory.get().layout_tests_dir()
 
     def _suffixes_for_actual_failures(self, test, build):
@@ skipping 99 matching lines @@
 
         test_baseline_set = TestBaselineSet(tool)
 
         for builder in builders_to_check:
             for test_prefix in args:
                 test_baseline_set.add(test_prefix, Build(builder))
 
         _log.debug('Rebaselining: %s', test_baseline_set)
 
         self.rebaseline(options, test_baseline_set)