diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/common')
| -rw-r--r-- | Tools/Scripts/webkitpy/common/config/committers.py | 4 | ||||
| -rw-r--r-- | Tools/Scripts/webkitpy/common/host_mock.py | 17 | ||||
| -rw-r--r-- | Tools/Scripts/webkitpy/common/system/executive_mock.py | 4 |
3 files changed, 15 insertions, 10 deletions
diff --git a/Tools/Scripts/webkitpy/common/config/committers.py b/Tools/Scripts/webkitpy/common/config/committers.py index 835b048bc..cdbd3e15b 100644 --- a/Tools/Scripts/webkitpy/common/config/committers.py +++ b/Tools/Scripts/webkitpy/common/config/committers.py @@ -301,7 +301,7 @@ committers_unable_to_review = [ Committer("Konrad Piascik", "kpiascik@rim.com", "kpiascik"), Committer("Kristof Kosztyo", "kkristof@inf.u-szeged.hu", "kkristof"), Committer("Krzysztof Kowalczyk", "kkowalczyk@gmail.com"), - Committer("Kwang Yul Seo", ["kwangyul.seo@gmail.com", "skyul@company100.net", "kseo@webkit.org"], "kwangseo"), + Committer("Kwang Yul Seo", ["skyul@company100.net", "kseo@webkit.org"], "kwangseo"), Committer("Leandro Gracia Gil", "leandrogracia@chromium.org", "leandrogracia"), Committer("Leandro Pereira", ["leandro@profusion.mobi", "leandro@webkit.org"], "acidx"), Committer("Leo Yang", ["leo.yang@torchmobile.com.cn", "leoyang@webkit.org", "leoyang.webkit@gmail.com", "leo.yang.c@gmail.com"], "leoyang"), @@ -383,7 +383,6 @@ committers_unable_to_review = [ Committer("Yael Aharon", "yael.aharon@nokia.com", "yael"), Committer("Yaar Schnitman", ["yaar@chromium.org", "yaar@google.com"]), Committer("Yi Shen", ["yi.4.shen@nokia.com", "shenyi2006@gmail.com"]), - Committer("Yong Li", ["yoli@rim.com", "yong.li.webkit@gmail.com"], "yoli"), Committer("Yongjun Zhang", ["yongjun.zhang@nokia.com", "yongjun_zhang@apple.com"]), Committer("Yoshifumi Inoue", "yosin@chromium.org", "yosin"), Committer("Yuqiang Xian", "yuqiang.xian@intel.com"), @@ -514,6 +513,7 @@ reviewers_list = [ Reviewer("Vicki Murley", "vicki@apple.com"), Reviewer("Vsevolod Vlasov", "vsevik@chromium.org", "vsevik"), Reviewer("Xan Lopez", ["xan.lopez@gmail.com", "xan@gnome.org", "xan@webkit.org", "xlopez@igalia.com"], "xan"), + Reviewer("Yong Li", ["yoli@rim.com", "yong.li.webkit@gmail.com"], "yoli"), Reviewer("Yury Semikhatsky", "yurys@chromium.org", "yurys"), Reviewer("Zack Rusin", "zack@kde.org", "zackr"), Reviewer("Zoltan Herczeg", ["zherczeg@webkit.org", "zherczeg@inf.u-szeged.hu"], "zherczeg"), diff --git a/Tools/Scripts/webkitpy/common/host_mock.py b/Tools/Scripts/webkitpy/common/host_mock.py index 55df3e9a2..ca4f78eb3 100644 --- a/Tools/Scripts/webkitpy/common/host_mock.py +++ b/Tools/Scripts/webkitpy/common/host_mock.py @@ -40,17 +40,17 @@ 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): + def __init__(self, log_executive=False, executive_throws_when_run=None, initialize_scm_by_default=True): MockSystemHost.__init__(self, log_executive, executive_throws_when_run) add_unit_tests_to_mock_filesystem(self.filesystem) self.web = MockWeb() self._checkout = MockCheckout() - self._scm = MockSCM(filesystem=self.filesystem, executive=self.executive) - # Various pieces of code (wrongly) call filesystem.chdir(checkout_root). - # Making the checkout_root exist in the mock filesystem makes that chdir not raise. - self.filesystem.maybe_make_directory(self._scm.checkout_root) - + self._scm = None + # 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.bugs = MockBugzilla() self.buildbot = MockBuildBot() self._chromium_buildbot = MockBuildBot() @@ -62,7 +62,10 @@ class MockHost(MockSystemHost): self._watch_list = MockWatchList() def _initialize_scm(self, patch_directories=None): - pass + self._scm = MockSCM(filesystem=self.filesystem, executive=self.executive) + # Various pieces of code (wrongly) call filesystem.chdir(checkout_root). + # 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 diff --git a/Tools/Scripts/webkitpy/common/system/executive_mock.py b/Tools/Scripts/webkitpy/common/system/executive_mock.py index b0db48ca3..a15c3654d 100644 --- a/Tools/Scripts/webkitpy/common/system/executive_mock.py +++ b/Tools/Scripts/webkitpy/common/system/executive_mock.py @@ -34,10 +34,12 @@ from webkitpy.common.system.executive import ScriptError class MockProcess(object): - def __init__(self, stdout='MOCK STDOUT\n'): + 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 |