Change rebaseline-test-internal to take port name option.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_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 optparse
 
 from webkitpy.common.net.buildbot import Build
 from webkitpy.common.net.layout_test_results import LayoutTestResults
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.layout_tests.builder_list import BuilderList
@@ skipping 210 matching lines @@
         self.command.tree_status = lambda: 'closed'
         self._execute_with_mock_options()
         self.assertEqual(self.tool.executive.calls, [])
 
         self.command.tree_status = lambda: 'open'
         self.tool.executive.calls = []
         self._execute_with_mock_options()
 
         self.assertEqual(self.tool.executive.calls, [
             [
-                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'png',
-                 '--builder', 'MOCK Mac10.11', '--test', 'fast/dom/prototype-strawberry.html'],
-                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt',
-                 '--builder', 'MOCK Mac10.11', '--test', 'fast/dom/prototype-taco.html'],
+                [
+                    'python', 'echo', 'copy-existing-baselines-internal',
+                    '--test', 'fast/dom/prototype-strawberry.html',
+                    '--suffixes', 'png',
+                    '--port-name', 'test-mac-mac10.11',
+                ],
+                [
+                    'python', 'echo', 'copy-existing-baselines-internal',
+                    '--test', 'fast/dom/prototype-taco.html',
+                    '--suffixes', 'txt',
+                    '--port-name', 'test-mac-mac10.11',
+                ],
             ],
             [
-                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png',
-                 '--builder', 'MOCK Mac10.11', '--test', 'fast/dom/prototype-strawberry.html'],
-                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
-                 '--builder', 'MOCK Mac10.11', '--test', 'fast/dom/prototype-taco.html'],
+                [
+                    'python', 'echo', 'rebaseline-test-internal',
+                    '--test', 'fast/dom/prototype-strawberry.html',
+                    '--suffixes', 'png',
+                    '--port-name', 'test-mac-mac10.11',
+                    '--builder', 'MOCK Mac10.11',
+                ],
+                [
+                    'python', 'echo', 'rebaseline-test-internal',
+                    '--test', 'fast/dom/prototype-taco.html',
+                    '--suffixes', 'txt',
+                    '--port-name', 'test-mac-mac10.11',
+                    '--builder', 'MOCK Mac10.11',
+                ],
             ],
             [
-                ['python', 'echo', 'optimize-baselines',
-                 '--suffixes', 'png', 'fast/dom/prototype-strawberry.html'],
-                ['python', 'echo', 'optimize-baselines',
-                 '--suffixes', 'txt', 'fast/dom/prototype-taco.html'],
+                [
+                    'python', 'echo', 'optimize-baselines',
+                    '--suffixes', 'png',
+                    'fast/dom/prototype-strawberry.html',
+                ],
+                [
+                    'python', 'echo', 'optimize-baselines',
+                    '--suffixes', 'txt',
+                    'fast/dom/prototype-taco.html',
+                ],
             ],
             ['git', 'cl', 'upload', '-f'],
             ['git', 'pull'],
             ['git', 'cl', 'land', '-f', '-v'],
             ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
             ['git', 'cl', 'set_close'],
         ])
 
         # The mac ports should both be removed since they're the only ones in builders._exact_matches.
         self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
@@ skipping 38 matching lines @@
             'MOCK Mac10.11': {'port_name': 'test-mac-mac10.11', 'specifiers': ['Mac10.11', 'Release']},
         })
 
         self.command.SECONDS_BEFORE_GIVING_UP = 0
         self.command.tree_status = lambda: 'open'
         self.tool.executive = MockExecutive()
         self.tool.executive.calls = []
         self._execute_with_mock_options()
 
         self.assertEqual(self.tool.executive.calls, [
-            [['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt',
-              '--builder', 'MOCK Mac10.11', '--test', 'fast/dom/prototype-taco.html']],
-            [['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
-              '--builder', 'MOCK Mac10.11', '--test', 'fast/dom/prototype-taco.html']],
-            [['python', 'echo', 'optimize-baselines', '--suffixes', 'txt', 'fast/dom/prototype-taco.html']],
+            [[
+                'python', 'echo', 'copy-existing-baselines-internal',
+                '--test', 'fast/dom/prototype-taco.html',
+                '--suffixes', 'txt',
+                '--port-name', 'test-mac-mac10.11',
+            ]],
+            [[
+                'python', 'echo', 'rebaseline-test-internal',
+                '--test', 'fast/dom/prototype-taco.html',
+                '--suffixes', 'txt',
+                '--port-name', 'test-mac-mac10.11',
+                '--builder', 'MOCK Mac10.11',
+            ]],
+            [[
+                'python', 'echo', 'optimize-baselines',
+                '--suffixes', 'txt',
+                'fast/dom/prototype-taco.html',
+            ]],
             ['git', 'cl', 'upload', '-f'],
         ])
 
     def test_execute_test_passes_everywhere(self):
         def blame(_):
             return """
 6469e754a1 path/to/TestExpectations                   (<foobarbaz1@chromium.org> 2013-04-28 04:52:41 +0000   13) Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """
         self.tool.git().blame = blame
 
@@ skipping 209 matching lines @@
 
     def test_execute_with_dry_run(self):
         self._basic_execute_test([], dry_run=True)
         self.assertEqual(self.tool.git().local_commits(), [])
 
     def test_bot_revision_data(self):
         self._setup_mock_build_data()
         self.assertEqual(
             self.command.bot_revision_data(self.tool.git()),
             [{'builder': 'MOCK Win7', 'revision': '9000'}])