| Index: Tools/Scripts/webkitpy/common/system/systemhost_mock.py
|
| diff --git a/Tools/Scripts/webkitpy/common/system/systemhost_mock.py b/Tools/Scripts/webkitpy/common/system/systemhost_mock.py
|
| index 4667b08b9ab8df24ab6151a71dc533e42567fe9e..b39b4ea0b7622bcd5c0c49f9135b4cbce42b5f3a 100644
|
| --- a/Tools/Scripts/webkitpy/common/system/systemhost_mock.py
|
| +++ b/Tools/Scripts/webkitpy/common/system/systemhost_mock.py
|
| @@ -1,30 +1,31 @@
|
| - # 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.
|
| +# 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.
|
| +from StringIO import StringIO
|
|
|
| from webkitpy.common.system.environment import Environment
|
| from webkitpy.common.system.executive_mock import MockExecutive
|
| @@ -48,5 +49,17 @@ class MockSystemHost(object):
|
| # FIXME: Should this take pointers to the filesystem and the executive?
|
| self.workspace = MockWorkspace()
|
|
|
| + self.stdout = StringIO()
|
| + self.stderr = StringIO()
|
| +
|
| def copy_current_environment(self):
|
| return Environment({"MOCK_ENVIRON_COPY": '1'})
|
| +
|
| + def print_(self, *args, **kwargs):
|
| + sep = kwargs.get('sep', ' ')
|
| + end = kwargs.get('end', '\n')
|
| + file = kwargs.get('file', None)
|
| + stderr = kwargs.get('stderr', False)
|
| +
|
| + file = file or (self.stderr if stderr else self.stdout)
|
| + file.write(sep.join([str(arg) for arg in args]) + end)
|
|
|