[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
eric at webkit.org
eric at webkit.org
Wed Dec 22 15:06:34 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 87ddb8355e5a11def0c05df0c059b79a410271f9
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 28 00:05:07 2010 +0000
2010-10-27 Eric Seidel <eric at webkit.org>
Reviewed by Ojan Vafai.
EWS bots should not use --quiet when running build-webkit
https://bugs.webkit.org/show_bug.cgi?id=48482
--quiet is only correct when the sub-process does the error reporting.
In the case of _can_build() the parent process is reporting the error.
We'd like the full build log at queues.webkit.org so someone can look
at the log and understand why the EWS is failing to build trunk.
* Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
* Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
* Scripts/webkitpy/tool/mocktool.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70731 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a0da419..e67217a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-27 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Ojan Vafai.
+
+ EWS bots should not use --quiet when running build-webkit
+ https://bugs.webkit.org/show_bug.cgi?id=48482
+
+ --quiet is only correct when the sub-process does the error reporting.
+ In the case of _can_build() the parent process is reporting the error.
+ We'd like the full build log at queues.webkit.org so someone can look
+ at the log and understand why the EWS is failing to build trunk.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
+ * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+ * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+ * Scripts/webkitpy/tool/mocktool.py:
+
2010-10-27 Brian Weinstein <bweinstein at apple.com>
More Windows build fixage. Rename a variable that was named string.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
index 81db32c..36f3c6b 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
@@ -51,7 +51,7 @@ class ChromiumWinTest(unittest.TestCase):
def test_setup_environ_for_server(self):
port = chromium_win.ChromiumWinPort()
- port._executive = mocktool.MockExecute(True)
+ port._executive = mocktool.MockExecutive(should_log=True)
port.path_from_chromium_base = self._mock_path_from_chromium_base
output = outputcapture.OutputCapture()
orig_environ = os.environ.copy()
@@ -63,7 +63,7 @@ class ChromiumWinTest(unittest.TestCase):
sys.platform = "win32"
port = chromium_win.ChromiumWinPort(
options=ChromiumWinTest.RegisterCygwinOption())
- port._executive = mocktool.MockExecute(True)
+ port._executive = mocktool.MockExecutive(should_log=True)
port.path_from_chromium_base = self._mock_path_from_chromium_base
setup_mount = self._mock_path_from_chromium_base("third_party",
"cygwin",
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
index b433dba..3b53d1a 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
@@ -50,8 +50,7 @@ class AbstractEarlyWarningSystem(AbstractReviewQueue):
self.port.flag(),
"--build-style=%s" % self._build_style,
"--force-clean",
- "--no-update",
- "--quiet"])
+ "--no-update"])
return True
except ScriptError, e:
failure_log = self._log_from_script_error_for_upload(e)
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
index ae44748..830e11c 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
@@ -33,10 +33,29 @@ from webkitpy.common.system.outputcapture import OutputCapture
from webkitpy.tool.bot.queueengine import QueueEngine
from webkitpy.tool.commands.earlywarningsystem import *
from webkitpy.tool.commands.queuestest import QueuesTest
-from webkitpy.tool.mocktool import MockTool
+from webkitpy.tool.mocktool import MockTool, MockOptions
class AbstractEarlyWarningSystemTest(QueuesTest):
+ def test_can_build(self):
+ # Needed to define port_name, used in AbstractEarlyWarningSystem.__init__
+ class TestEWS(AbstractEarlyWarningSystem):
+ port_name = "win" # Needs to be a port which port/factory understands.
+
+ queue = TestEWS()
+ queue.bind_to_tool(MockTool(log_executive=True))
+ queue._options = MockOptions(port=None)
+ expected_stderr = "MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build', '--port=win', '--build-style=release', '--force-clean', '--no-update']\n"
+ OutputCapture().assert_outputs(self, queue._can_build, [], expected_stderr=expected_stderr)
+
+ def mock_run_webkit_patch(args):
+ raise ScriptError("MOCK script error")
+
+ queue.run_webkit_patch = mock_run_webkit_patch
+ expected_stderr = "MOCK: update_status: None Unable to perform a build\n"
+ OutputCapture().assert_outputs(self, queue._can_build, [], expected_stderr=expected_stderr)
+
+ # FIXME: This belongs on an AbstractReviewQueueTest object in queues_unittest.py
def test_subprocess_handled_error(self):
queue = AbstractReviewQueue()
queue.bind_to_tool(MockTool())
diff --git a/WebKitTools/Scripts/webkitpy/tool/mocktool.py b/WebKitTools/Scripts/webkitpy/tool/mocktool.py
index 6a27b95..a0f01a7 100644
--- a/WebKitTools/Scripts/webkitpy/tool/mocktool.py
+++ b/WebKitTools/Scripts/webkitpy/tool/mocktool.py
@@ -568,7 +568,7 @@ class MockStatusServer(object):
# FIXME: This should not inherit from Mock
-class MockExecute(Mock):
+class MockExecutive(Mock):
def __init__(self, should_log):
self._should_log = should_log
@@ -627,7 +627,7 @@ class MockTool(object):
self.wakeup_event = threading.Event()
self.bugs = MockBugzilla()
self.buildbot = MockBuildBot()
- self.executive = MockExecute(should_log=log_executive)
+ self.executive = MockExecutive(should_log=log_executive)
self._irc = None
self.user = MockUser()
self._scm = MockSCM()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list