Changeset 70731 in webkit

Timestamp:

Oct 27, 2010 5:05:07 PM (13 years ago)

Author:

eric@webkit.org

Message:

2010-10-27 Eric Seidel <​eric@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:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/earlywarningsystem.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/mocktool.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-27  Eric Seidel  <eric@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@apple.com>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py

@@ -52 +52 @@
     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()
@@ -64 +64 @@
         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",

trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py

@@ -51 +51 @@
                 "--build-style=%s" % self._build_style,
                 "--force-clean",
-                "--no-update",
-                "--quiet"])
+                "--no-update"])
             return True
         except ScriptError, e:

trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py

@@ -34 +34 @@
 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()

trunk/WebKitTools/Scripts/webkitpy/tool/mocktool.py

@@ -569 +569 @@
 
 # FIXME: This should not inherit from Mock
-class MockExecute(Mock):
+class MockExecutive(Mock):
     def __init__(self, should_log):
         self._should_log = should_log
@@ -628 +628 @@
         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()