Unify MockExecutive and MockExecutive2.

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 optparse
 import unittest
 
 from webkitpy.common.net.buildbot import Build
 from webkitpy.common.net.layout_test_results import LayoutTestResults
-from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
+from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.output_capture import OutputCapture
 from webkitpy.layout_tests.builder_list import BuilderList
 from webkitpy.tool.commands.rebaseline import (
     AbstractParallelRebaselineCommand, CopyExistingBaselinesInternal,
     Rebaseline, RebaselineExpectations, RebaselineJson, RebaselineTest
 )
 from webkitpy.tool.mock_tool import MockWebKitPatch
 
 
 # pylint: disable=protected-access
@@ skipping 121 matching lines @@
                 port.layout_tests_dir(),
                 'platform/test-mac-mac10.11/failures/expected/image-expected.txt')),
             'original mac10.11 result')
         self.assertEqual(
             self._read(self.tool.filesystem.join(
                 port.layout_tests_dir(),
                 'platform/test-mac-mac10.10/failures/expected/image-expected.txt')),
             'original mac10.11 result')
 
     def test_copying_overwritten_baseline_to_multiple_locations(self):
-        self.tool.executive = MockExecutive2()
+        self.tool.executive = MockExecutive()
 
     def test_copy_baseline_win7_to_linux_trusty(self):
         port = self.tool.port_factory.get('test-win-win7')
         self._write(
             self.tool.filesystem.join(
                 port.layout_tests_dir(),
                 'platform/test-win-win7/failures/expected/image-expected.txt'),
             'original win7 result')
         self.assertFalse(self.tool.filesystem.exists(
             self.tool.filesystem.join(
@@ skipping 128 matching lines @@
 
     def test_rebaseline_reftest(self):
         self._write("userscripts/another-test.html", "test data")
         self._write("userscripts/another-test-expected.html", "generic result")
         OutputCapture().assert_outputs(
             self, self.command._rebaseline_test_and_update_expectations, args=[self.options(suffixes='png')],
             expected_logs="Cannot rebaseline image result for reftest: userscripts/another-test.html\n")
         self.assertDictEqual(self.command.expectation_line_changes.to_dict(), {'remove-lines': []})
 
     def test_rebaseline_test_internal_with_port_that_lacks_buildbot(self):
-        self.tool.executive = MockExecutive2()
+        self.tool.executive = MockExecutive()
 
         port = self.tool.port_factory.get('test-win-win7')
         self._write(
             port.host.filesystem.join(
                 port.layout_tests_dir(),
                 'platform/test-win-win10/failures/expected/image-expected.txt'),
             'original win10 result')
 
         oc = OutputCapture()
         try:
@@ skipping 62 matching lines @@
         self.command._remove_all_pass_testharness_baselines(test_prefix_list)
         self.assertFalse(self.tool.filesystem.exists(
             '/test.checkout/LayoutTests/passes/text-expected.txt'))
 
 
 class TestRebaselineJson(BaseTestCase):
     command_constructor = RebaselineJson
 
     def setUp(self):
         super(TestRebaselineJson, self).setUp()
-        self.tool.executive = MockExecutive2()
+        self.tool.executive = MockExecutive()
 
     def tearDown(self):
         super(TestRebaselineJson, self).tearDown()
 
     @staticmethod
     def options(**kwargs):
         return optparse.Values(dict({
             'optimize': True,
             'verbose': True,
             'results_directory': None
@@ skipping 104 matching lines @@
                 '/mock-checkout/third_party/WebKit/LayoutTests/x/foo-expected.png',
                 '/mock-checkout/third_party/WebKit/LayoutTests/x/foo-expected.txt',
             ])
 
 
 class TestRebaselineJsonUpdatesExpectationsFiles(BaseTestCase):
     command_constructor = RebaselineJson
 
     def setUp(self):
         super(TestRebaselineJsonUpdatesExpectationsFiles, self).setUp()
-        self.tool.executive = MockExecutive2()
+        self.tool.executive = MockExecutive()
 
         def mock_run_command(*args, **kwargs):  # pylint: disable=unused-argument
             return '{"add": [], "remove-lines": [{"test": "userscripts/first-test.html", "builder": "MOCK Mac10.11"}]}\n'
         self.tool.executive.run_command = mock_run_command
 
     @staticmethod
     def options():
         return optparse.Values({
             'optimize': False,
             'verbose': True,
@@ skipping 168 matching lines @@
             'results_directory': None
         })
 
     def _write_test_file(self, port, path, contents):
         abs_path = self.tool.filesystem.join(port.layout_tests_dir(), path)
         self.tool.filesystem.write_text_file(abs_path, contents)
 
     def test_rebaseline_expectations(self):
         self._zero_out_test_expectations()
 
-        self.tool.executive = MockExecutive2()
+        self.tool.executive = MockExecutive()
 
         for builder in ['MOCK Mac10.10', 'MOCK Mac10.11']:
             self.tool.buildbot.set_results(Build(builder), LayoutTestResults({
                 "tests": {
                     "userscripts": {
                         "another-test.html": {
                             "expected": "PASS",
                             "actual": "PASS TEXT"
                         },
                         "images.svg": {
@@ skipping 33 matching lines @@
                 ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png',
                  '--builder', 'MOCK Mac10.10', '--test', 'userscripts/images.svg'],
                 ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png',
                  '--builder', 'MOCK Mac10.11', '--test', 'userscripts/images.svg'],
             ],
         ])
 
     def test_rebaseline_expectations_reftests(self):
         self._zero_out_test_expectations()
 
-        self.tool.executive = MockExecutive2()
+        self.tool.executive = MockExecutive()
 
         for builder in ['MOCK Mac10.10', 'MOCK Mac10.11']:
             self.tool.buildbot.set_results(Build(builder), LayoutTestResults({
                 "tests": {
                     "userscripts": {
                         "reftest-text.html": {
                             "expected": "PASS",
                             "actual": "TEXT"
                         },
                         "reftest-image.html": {
@@ skipping 179 matching lines @@
         for cmd_line, cwd in commands:
             out = self.run_command(cmd_line, cwd=cwd)
             if 'rebaseline-test-internal' in cmd_line:
                 out = '{"remove-lines": [{"test": "%s", "builder": "%s"}]}\n' % (cmd_line[8], cmd_line[6])
             command_outputs.append([0, out, ''])
 
         new_calls = self.calls[num_previous_calls:]
         self.calls = self.calls[:num_previous_calls]
         self.calls.append(new_calls)
         return command_outputs