Unify MockExecutive and MockExecutive2.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py

 # Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #
 # 1. Redistributions of source code must retain the above
 #    copyright notice, this list of conditions and the following
 #    disclaimer.
 # 2. Redistributions in binary form must reproduce the above
@@ skipping 11 matching lines @@
 # PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
 import optparse
 import unittest
 
 from webkitpy.common.host_mock import MockHost
+from webkitpy.common.system.executive_mock import MockExecutive, ScriptError
 from webkitpy.common.system.filesystem_mock import MockFileSystem
-from webkitpy.common.system.executive_mock import MockExecutive2, ScriptError
 from webkitpy.w3c.test_importer import TestImporter
 
 
 FAKE_SOURCE_REPO_DIR = '/blink'
 
 FAKE_FILES = {
     '/mock-checkout/third_party/Webkit/LayoutTests/w3c/OWNERS': '',
     '/blink/w3c/dir/has_shebang.txt': '#!',
     '/blink/w3c/dir/README.txt': '',
     '/blink/w3c/dir/OWNERS': '',
@@ skipping 14 matching lines @@
             "overwrite": False,
             "destination": "w3c",
             "ignore_expectations": False,
             "dry_run": False,
         }
         options.update(kwargs)
         return optparse.Values(options)
 
     def test_import_dir_with_no_tests(self):
         host = MockHost()
-        host.executive = MockExecutive2(exception=ScriptError(
+        host.executive = MockExecutive(exception=ScriptError(
             "abort: no repository found in '/Volumes/Source/src/wk/Tools/Scripts/webkitpy/w3c'"))
         host.filesystem = MockFileSystem(files=FAKE_FILES)
         importer = TestImporter(host, FAKE_SOURCE_REPO_DIR, self.options())
         importer.do_import()  # No exception raised.
 
     def test_path_too_long_true(self):
         importer = TestImporter(MockHost(), FAKE_SOURCE_REPO_DIR, self.options())
         self.assertTrue(importer.path_too_long(FAKE_SOURCE_REPO_DIR + '/' + ('x' * 150) + '.html'))
 
     def test_path_too_long_false(self):
@@ skipping 99 matching lines @@
     def test_should_not_try_to_convert_test_in_wpt(self):
         self.assertFalse(TestImporter.should_try_to_convert({}, 'foo.html', 'LayoutTests/imported/wpt/foo'))
 
     def test_should_not_try_to_convert_other_file_types(self):
         self.assertFalse(TestImporter.should_try_to_convert({}, 'foo.bar', 'LayoutTests/imported/csswg-test/x'))
         self.assertFalse(TestImporter.should_try_to_convert({}, 'foo.js', 'LayoutTests/imported/csswg-test/x'))
         self.assertFalse(TestImporter.should_try_to_convert({}, 'foo.md', 'LayoutTests/imported/csswg-test/x'))
         self.assertFalse(TestImporter.should_try_to_convert({}, 'foo.png', 'LayoutTests/imported/csswg-test/x'))
         self.assertFalse(TestImporter.should_try_to_convert({}, 'foo.svg', 'LayoutTests/imported/csswg-test/x'))
         self.assertFalse(TestImporter.should_try_to_convert({}, 'foo.svgz', 'LayoutTests/imported/csswg-test/x'))