Changeset 85472 in webkit

Timestamp:

May 2, 2011 5:13:00 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-02 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r85469.
​http://trac.webkit.org/changeset/85469
​https://bugs.webkit.org/show_bug.cgi?id=59928

Broke webkitpy-tests on Windows 7, GTK and Qt. (Requested by
bbandix on #webkit).

• Scripts/webkitpy/tool/bot/earlywarningsystemtask.py: Removed.
• Scripts/webkitpy/tool/commands/earlywarningsystem.py:
• Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/bot/earlywarningsystemtask.py (deleted)
• Scripts/webkitpy/tool/commands/earlywarningsystem.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-02  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r85469.
+        http://trac.webkit.org/changeset/85469
+        https://bugs.webkit.org/show_bug.cgi?id=59928
+
+        Broke  webkitpy-tests on Windows 7, GTK and Qt. (Requested by
+        bbandix on #webkit).
+
+        * Scripts/webkitpy/tool/bot/earlywarningsystemtask.py: Removed.
+        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+
 2011-05-02  Tomasz Morawski  <t.morawski@samsung.com>
 

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

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from webkitpy.tool.commands.queues import AbstractReviewQueue
 from webkitpy.common.config.committers import CommitterList
 from webkitpy.common.config.ports import WebKitPort
-from webkitpy.common.system.deprecated_logging import error, log
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.tool.bot.expectedfailures import ExpectedFailures
-from webkitpy.tool.bot.layouttestresultsreader import LayoutTestResultsReader
 from webkitpy.tool.bot.queueengine import QueueEngine
-from webkitpy.tool.bot.earlywarningsystemtask import EarlyWarningSystemTask, EarlyWarningSystemTaskDelegate, UnableToApplyPatch
-from webkitpy.tool.commands.queues import AbstractReviewQueue
 
 
@@ -110 +106 @@
         exit(1)
 
-# FIXME: This should merge with AbstractEarlyWarningSystem once all the EWS
-# bots run tests.
-class AbstractTestingEWS(AbstractEarlyWarningSystem):
-    def begin_work_queue(self):
-        # FIXME: This violates abstraction
-        self._tool._port = self.port
-        AbstractEarlyWarningSystem.begin_work_queue(self)
-        self._expected_failures = ExpectedFailures()
-        self._layout_test_results_reader = LayoutTestResultsReader(self._tool, self._log_directory())
-
-    def review_patch(self, patch):
-        task = EarlyWarningSystemTask(self, patch)
-        if not task.validate():
-            self._did_error(patch, "%s did not process patch." % self.name)
-            return False
-        try:
-            return task.run()
-        except UnableToApplyPatch, e:
-            self._did_error(patch, "%s unable to apply patch." % self.name)
-            return False
-        except ScriptError, e:
-            # FIXME: We should upload the results archive on failure.
-            results_link = self._tool.status_server.results_url_for_status(task.failure_status_id)
-            message = "Attachment %s did not pass %s:\nOutput: %s" % (patch.id(), self.name, results_link)
-            results = task.results_from_patch_test_run(patch)
-            unexpected_failures = self._expected_failures.unexpected_failures(results)
-            if unexpected_failures:
-                message += "\nNew failing tests:\n%s" % "\n".join(unexpected_failures)
-            self._tool.bugs.post_comment_to_bug(patch.bug_id(), message, cc=self.watchers)
-            raise
-
-    # EarlyWarningSystemDelegate methods
-
-    def parent_command(self):
-        return self.name
-
-    def run_command(self, command):
-        self.run_webkit_patch(command + [self.port.flag()])
-
-    def command_passed(self, message, patch):
-        pass
-
-    def command_failed(self, message, script_error, patch):
-        failure_log = self._log_from_script_error_for_upload(script_error)
-        return self._update_status(message, patch=patch, results_file=failure_log)
-
-    def expected_failures(self):
-        return self._expected_failures
-
-    def layout_test_results(self):
-        return self._layout_test_results_reader.results()
-
-    def archive_last_layout_test_results(self, patch):
-        return self._layout_test_results_reader.archive(patch)
-
-    def refetch_patch(self, patch):
-        return self._tool.bugs.fetch_attachment(patch.id())
-
-    def report_flaky_tests(self, patch, flaky_test_results, results_archive):
-        pass
-
-    # StepSequenceErrorHandler methods
-
-    @classmethod
-    def handle_script_error(cls, tool, state, script_error):
-        log(script_error.message_with_output())
-
 
 class GtkEWS(AbstractEarlyWarningSystem):

trunk/Tools/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, MockOptions, MockPort
+from webkitpy.tool.mocktool import MockTool, MockOptions
 
 
@@ -109 +109 @@
         self.assert_queue_outputs(ews, expected_stderr=expected_stderr, expected_exceptions=expected_exceptions)
 
-    def test_testing_ews(self):
-        class ConcreteTestingEWS(AbstractTestingEWS):
-            name = "mock-testing-ews-name"
-            port_name = "mock-port"
-        ews = ConcreteTestingEWS()
-        ews.port = MockPort()
-        expected_stderr = {
-            "begin_work_queue": """CAUTION: mock-testing-ews-name will discard all local changes in "/private/tmp"
-Running WebKit mock-testing-ews-name.
-MOCK: update_status: mock-testing-ews-name Starting Queue
-""",
-            "handle_unexpected_error": """Mock error message
-""",
-            "next_work_item": "",
-            "process_work_item": """MOCK: update_status: mock-testing-ews-name Pass
-MOCK: release_work_item: mock-testing-ews-name 197
-""",
-            "handle_script_error": """ScriptError error message
-""",
-        }
-        self.assert_queue_outputs(ews, expected_stderr=expected_stderr)
-
     # FIXME: If all EWSes are going to output the same text, we
     # could test them all in one method with a for loop over an array.