Unify MockExecutive and MockExecutive2.

third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive_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
 # in the documentation and/or other materials provided with the
 # distribution.
 #    * Neither the name of Google Inc. nor the names of its
 # contributors may be used to endorse or promote products derived from
 # this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR 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 StringIO
 import logging
 import os
+import StringIO
 
 from webkitpy.common.system.executive import ScriptError
 
 _log = logging.getLogger(__name__)
 
 
 class MockProcess(object):
 
     def __init__(self, stdout='MOCK STDOUT\n', stderr=''):
         self.pid = 42
         self.stdout = StringIO.StringIO(stdout)
         self.stderr = StringIO.StringIO(stderr)
         self.stdin = StringIO.StringIO()
         self.returncode = 0
 
     def wait(self):
         return
 
     def poll(self):
         # Consider the process completed when all the stdout and stderr has been read.
         if self.stdout.len != self.stdout.tell() or self.stderr.len != self.stderr.tell():
             return None
         return self.returncode
 
     def communicate(self, *_):
         return (self.stdout.getvalue(), self.stderr.getvalue())
 
 
-# FIXME: This should be unified with MockExecutive2 (http://crbug.com/626115).
 class MockExecutive(object):
     PIPE = "MOCK PIPE"
     STDOUT = "MOCK STDOUT"
 
     @staticmethod
     def ignore_error(error):
         pass
 
     def __init__(self, should_log=False, should_throw=False,
                  output="MOCK output of child process", stderr='',
@@ skipping 113 matching lines @@
         new_calls = self.calls[num_previous_calls:]
         self.calls = self.calls[:num_previous_calls]
         self.calls.append(new_calls)
         return command_outputs
 
     def map(self, thunk, arglist, processes=None):
         return map(thunk, arglist)
 
     def process_dump(self):
         return []
-
-
-class MockExecutive2(MockExecutive):
-    """MockExecutive2 is like MockExecutive except it doesn't log anything."""
-
-    def __init__(self, output='', exit_code=0, exception=None, run_command_fn=None, stderr=''):
-        super(MockExecutive2, self).__init__()
-        self._output = output
-        self._stderr = stderr
-        self._exit_code = exit_code
-        self._exception = exception
-        self._run_command_fn = run_command_fn
-
-    def run_command(self,
-                    args,
-                    cwd=None,
-                    input=None,
-                    error_handler=None,
-                    return_exit_code=False,
-                    return_stderr=True,
-                    decode_output=False,
-                    env=None,
-                    debug_logging=False):
-        self.calls.append(args)
-        assert isinstance(args, list) or isinstance(args, tuple)
-        assert all(isinstance(arg, basestring) for arg in args)
-        if self._exception:
-            raise self._exception  # pylint: disable=raising-bad-type
-        if self._run_command_fn:
-            return self._run_command_fn(args)
-        if return_exit_code:
-            return self._exit_code
-        if self._exit_code and error_handler:
-            script_error = ScriptError(script_args=args, exit_code=self._exit_code, output=self._output)
-            error_handler(script_error)
-        if return_stderr:
-            return self._output + self._stderr
-        return self._output