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

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_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
 import unittest
 
 from webkitpy.common.net.buildbot import Build
 from webkitpy.common.net.layout_test_results import LayoutTestResults
@@ skipping 510 matching lines @@
                     '--suffixes', 'txt,png',
                     '--port-name', 'test-win-win7',
                 ]],
                 [[
                     'python', 'echo', 'rebaseline-test-internal',
                     '--verbose',
                     '--test', 'userscripts/first-test.html',
                     '--suffixes', 'txt,png',
                     '--port-name', 'test-win-win7',
                     '--builder', 'MOCK Win7',
-                    '--results-directory', '/tmp']]
+                    '--results-directory', '/tmp',
+                ]],
             ])
 
     def test_unstaged_baselines(self):
         git = self.tool.git()
         git.unstaged_changes = lambda: {
             'third_party/WebKit/LayoutTests/x/foo-expected.txt': 'M',
             'third_party/WebKit/LayoutTests/x/foo-expected.something': '?',
             'third_party/WebKit/LayoutTests/x/foo-expected.png': '?',
             'third_party/WebKit/LayoutTests/x/foo.html': 'M',
             'docs/something.md': '?',
         }
         self.assertEqual(
             self.command.unstaged_baselines(),
             [
                 '/mock-checkout/third_party/WebKit/LayoutTests/x/foo-expected.png',
                 '/mock-checkout/third_party/WebKit/LayoutTests/x/foo-expected.txt',
             ])
 
+    def test_rebaseline_with_different_port_name(self):
+        self._setup_mock_build_data()
+        self._write('userscripts/first-test.html', 'Dummy test contents')
+        test_baseline_set = TestBaselineSet(self.tool)
+        test_baseline_set.add('userscripts/first-test.html', Build('MOCK Win7'), 'test-win-win10')
+        self.command.rebaseline(self.options(), test_baseline_set)
+
+        self.assertEqual(
+            self.tool.executive.calls,
+            [
+                [[
+                    'python', 'echo', 'copy-existing-baselines-internal',
+                    '--verbose',
+                    '--test', 'userscripts/first-test.html',
+                    '--suffixes', 'txt,png',
+                    '--port-name', 'test-win-win10',
+
+                ]],
+                [[
+                    'python', 'echo', 'rebaseline-test-internal',
+                    '--verbose',
+                    '--test', 'userscripts/first-test.html',
+                    '--suffixes', 'txt,png',
+                    '--port-name', 'test-win-win10',
+                    '--builder', 'MOCK Win7',
+                ]],
+                [[
+                    'python', 'echo', 'optimize-baselines',
+                    '--verbose',
+                    '--suffixes', 'txt,png',
+                    'userscripts/first-test.html',
+                ]]
+            ])
+
 
 class TestRebaselineUpdatesExpectationsFiles(BaseTestCase):
     """Tests for the logic related to updating the test expectations file."""
     command_constructor = Rebaseline
 
     def setUp(self):
         super(TestRebaselineUpdatesExpectationsFiles, self).setUp()
         self.tool.executive = MockExecutive()
 
         def mock_run_command(*args, **kwargs):  # pylint: disable=unused-argument
@@ skipping 566 matching lines @@
         })
         self.host = host
 
     def test_add_and_iter_tests(self):
         test_baseline_set = TestBaselineSet(host=self.host)
         test_baseline_set.add('a', Build('MOCK Trusty'))
         test_baseline_set.add('a/z.html', Build('MOCK Win10'))
         self.assertEqual(
             list(test_baseline_set),
             [
-                ('a/x.html', Build(builder_name='MOCK Trusty')),
-                ('a/y.html', Build(builder_name='MOCK Trusty')),
-                ('a/z.html', Build(builder_name='MOCK Trusty')),
-                ('a/z.html', Build(builder_name='MOCK Win10')),
+                ('a/x.html', Build(builder_name='MOCK Trusty'), 'test-linux-trusty'),
+                ('a/y.html', Build(builder_name='MOCK Trusty'), 'test-linux-trusty'),
+                ('a/z.html', Build(builder_name='MOCK Trusty'), 'test-linux-trusty'),
+                ('a/z.html', Build(builder_name='MOCK Win10'), 'test-win-win10'),
             ])
 
     def test_str_empty(self):
         test_baseline_set = TestBaselineSet(host=self.host)
         self.assertEqual(str(test_baseline_set), '<Empty TestBaselineSet>')
 
     def test_str_basic(self):
         test_baseline_set = TestBaselineSet(host=self.host)
         test_baseline_set.add('a/x.html', Build('MOCK Mac10.12'))
         test_baseline_set.add('a/x.html', Build('MOCK Win10'))
         self.assertEqual(
             str(test_baseline_set),
             ('<TestBaselineSet with:\n'
-             '  a/x.html: Build(builder_name=\'MOCK Mac10.12\', build_number=None)\n'
-             '  a/x.html: Build(builder_name=\'MOCK Win10\', build_number=None)>'))
+             '  a/x.html: Build(builder_name=\'MOCK Mac10.12\', build_number=None), test-mac-mac10.12\n'
+             '  a/x.html: Build(builder_name=\'MOCK Win10\', build_number=None), test-win-win10>'))