Make MockExecutive behave more like MockExecutive2.

third_party/WebKit/Tools/Scripts/webkitpy/common/host_mock.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #    * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 22 matching lines @@
 from webkitpy.common.system.system_host_mock import MockSystemHost
 
 # New-style ports need to move down into webkitpy.common.
 from webkitpy.layout_tests.builder_list import BuilderList
 from webkitpy.layout_tests.port.factory import PortFactory
 from webkitpy.layout_tests.port.test import add_unit_tests_to_mock_filesystem
 
 
 class MockHost(MockSystemHost):
 
-    def __init__(self, log_executive=False, executive_throws_when_run=None,
-                 initialize_scm_by_default=True, web=None, scm=None, os_name=None, os_version=None,
+    def __init__(self,
+                 log_executive=False,
+                 initialize_scm_by_default=True,
+                 web=None,
+                 scm=None,
+                 os_name=None,
+                 os_version=None,
                  time_return_val=123):
-
-        MockSystemHost.__init__(self, log_executive, executive_throws_when_run, os_name=os_name,
-                                os_version=os_version, time_return_val=time_return_val)
+        super(MockHost, self).__init__(
+            log_executive=log_executive,
+            os_name=os_name,
+            os_version=os_version,
+            time_return_val=time_return_val)
 
         add_unit_tests_to_mock_filesystem(self.filesystem)
         self.web = web or MockWeb()
 
         self._scm = scm
         # FIXME: we should never initialize the SCM by default, since the real
         # object doesn't either. This has caused at least one bug (see bug 89498).
         if initialize_scm_by_default:
             self.initialize_scm()
         self.buildbot = MockBuildBot()
@@ skipping 11 matching lines @@
         # Making the checkout_root exist in the mock filesystem makes that chdir not raise.
         self.filesystem.maybe_make_directory(self._scm.checkout_root)
 
     def scm(self):
         return self._scm
 
     def scm_for_path(self, path):
         # FIXME: consider supporting more than one SCM so that we can do more comprehensive testing.
         self.initialize_scm()
         return self._scm