rebaseline-cl: Add logic for selecting a related builder when filling in results.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl_unittest.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.
 
 import json
 import optparse
 
 from webkitpy.common.net.buildbot import Build
 from webkitpy.common.net.git_cl import GitCL
 from webkitpy.common.checkout.git_mock import MockGit
@@ skipping 322 matching lines @@
     def test_continues_with_missing_results_when_filling_results(self):
         self.tool.buildbot.set_results(Build('MOCK Try Win', 5000), None)
         return_code = self.command.execute(self.command_options(fill_missing=True), ['fast/dom/prototype-taco.html'], self.tool)
         self.assertEqual(return_code, 0)
         self.assertLog([
             'INFO: Failed to fetch results for Build(builder_name=\'MOCK Try Win\', build_number=5000)\n',
             'INFO: Results URL: https://storage.googleapis.com/chromium-layout-test-archives'
             '/MOCK_Try_Win/5000/layout-test-results/results.html\n',
             'INFO: Retry job by running: git cl try -b MOCK Try Win\n',
             'INFO: For fast/dom/prototype-taco.html:\n',
-            'INFO: Using Build(builder_name=\'MOCK Try Mac\', build_number=4000) to supply results for test-win-win7.\n',
+            'INFO: Using Build(builder_name=\'MOCK Try Linux\', build_number=6000) to supply results for test-win-win7.\n',
             'INFO: Rebaselining fast/dom/prototype-taco.html\n'
         ])
 
     def test_bails_when_there_are_unstaged_baselines(self):
         git = self.tool.git()
         git.unstaged_changes = lambda: {'third_party/WebKit/LayoutTests/my-test-expected.txt': '?'}
         return_code = self.command.execute(self.command_options(), [], self.tool)
         self.assertEqual(return_code, 1)
         self.assertLog([
             'ERROR: Aborting: there are unstaged baselines:\n',
             'ERROR:   /mock-checkout/third_party/WebKit/LayoutTests/my-test-expected.txt\n',
         ])
 
     def test_fill_in_missing_results(self):
         test_baseline_set = TestBaselineSet(self.tool)
         test_baseline_set.add('fast/dom/prototype-taco.html', Build('MOCK Try Linux', 100))
         test_baseline_set.add('fast/dom/prototype-taco.html', Build('MOCK Try Win', 200))
         self.command.fill_in_missing_results(test_baseline_set)
         self.assertEqual(
             test_baseline_set.build_port_pairs('fast/dom/prototype-taco.html'),
             [
                 (Build(builder_name='MOCK Try Linux', build_number=100), 'test-linux-trusty'),
                 (Build(builder_name='MOCK Try Win', build_number=200), 'test-win-win7'),
                 (Build(builder_name='MOCK Try Linux', build_number=100), 'test-mac-mac10.11'),
             ])
         self.assertLog([
             'INFO: For fast/dom/prototype-taco.html:\n',
             'INFO: Using Build(builder_name=\'MOCK Try Linux\', build_number=100) to supply results for test-mac-mac10.11.\n',
         ])
+
+    def test_fill_in_missing_results_prefers_build_with_same_os_type(self):
+        self.tool.builders = BuilderList({
+            'MOCK Foo12': {
+                'port_name': 'foo-foo12',
+                'specifiers': ['Foo12', 'Release'],
+                'is_try_builder': True,
+            },
+            'MOCK Foo45': {
+                'port_name': 'foo-foo45',
+                'specifiers': ['Foo45', 'Release'],
+                'is_try_builder': True,
+            },
+            'MOCK Bar3': {
+                'port_name': 'bar-bar3',
+                'specifiers': ['Bar3', 'Release'],
+                'is_try_builder': True,
+            },
+            'MOCK Bar4': {
+                'port_name': 'bar-bar4',
+                'specifiers': ['Bar4', 'Release'],
+                'is_try_builder': True,
+            },
+        })
+        test_baseline_set = TestBaselineSet(self.tool)
+        test_baseline_set.add('fast/dom/prototype-taco.html', Build('MOCK Foo12', 100))
+        test_baseline_set.add('fast/dom/prototype-taco.html', Build('MOCK Bar4', 200))
+        self.command.fill_in_missing_results(test_baseline_set)
+        self.assertEqual(
+            test_baseline_set.build_port_pairs('fast/dom/prototype-taco.html'),
+            [
+                (Build(builder_name='MOCK Foo12', build_number=100), 'foo-foo12'),
+                (Build(builder_name='MOCK Bar4', build_number=200), 'bar-bar4'),
+                (Build(builder_name='MOCK Foo12', build_number=100), 'foo-foo45'),
+                (Build(builder_name='MOCK Bar4', build_number=200), 'bar-bar3'),
+            ])
+        self.assertLog([
+            'INFO: For fast/dom/prototype-taco.html:\n',
+            'INFO: Using Build(builder_name=\'MOCK Foo12\', build_number=100) to supply results for foo-foo45.\n',
+            'INFO: Using Build(builder_name=\'MOCK Bar4\', build_number=200) to supply results for bar-bar3.\n',
+        ])