summaryrefslogtreecommitdiff
path: root/Tools/Scripts/webkitpy/common/system/systemhost_mock.py
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-02-03 09:55:33 +0100
committerSimon Hausmann <simon.hausmann@nokia.com>2012-02-03 09:55:33 +0100
commitcd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch)
tree8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Tools/Scripts/webkitpy/common/system/systemhost_mock.py
parentd11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff)
downloadqtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Tools/Scripts/webkitpy/common/system/systemhost_mock.py')
-rw-r--r--Tools/Scripts/webkitpy/common/system/systemhost_mock.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Tools/Scripts/webkitpy/common/system/systemhost_mock.py b/Tools/Scripts/webkitpy/common/system/systemhost_mock.py
index 61f8972bf..f3bc94139 100644
--- a/Tools/Scripts/webkitpy/common/system/systemhost_mock.py
+++ b/Tools/Scripts/webkitpy/common/system/systemhost_mock.py
@@ -35,11 +35,15 @@ from webkitpy.common.system.workspace_mock import MockWorkspace
class MockSystemHost(object):
- def __init__(self, log_executive=False, executive_throws_when_run=None):
+ 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()
self.user = MockUser()
self.platform = MockPlatformInfo()
+ if os_name:
+ self.platform.os_name = os_name
+ if os_version:
+ self.platform.os_version = os_version
# FIXME: Should this take pointers to the filesystem and the executive?
self.workspace = MockWorkspace()