diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Tools/Scripts/webkitpy/common/system/systemhost_mock.py | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Tools/Scripts/webkitpy/common/system/systemhost_mock.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/common/system/systemhost_mock.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/Scripts/webkitpy/common/system/systemhost_mock.py b/Tools/Scripts/webkitpy/common/system/systemhost_mock.py index f3bc94139..4667b08b9 100644 --- a/Tools/Scripts/webkitpy/common/system/systemhost_mock.py +++ b/Tools/Scripts/webkitpy/common/system/systemhost_mock.py @@ -35,9 +35,9 @@ from webkitpy.common.system.workspace_mock import MockWorkspace class MockSystemHost(object): - def __init__(self, log_executive=False, executive_throws_when_run=None, os_name=None, os_version=None): - self.executive = MockExecutive(should_log=log_executive, should_throw_when_run=executive_throws_when_run) - self.filesystem = MockFileSystem() + def __init__(self, log_executive=False, executive_throws_when_run=None, os_name=None, os_version=None, executive=None, filesystem=None): + self.executive = executive or MockExecutive(should_log=log_executive, should_throw_when_run=executive_throws_when_run) + self.filesystem = filesystem or MockFileSystem() self.user = MockUser() self.platform = MockPlatformInfo() if os_name: |