Changeset 84704 in webkit

Timestamp:

Apr 22, 2011 4:35:44 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-04-22 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

CommitQueue should remember the expected failures from patch to patch
​https://bugs.webkit.org/show_bug.cgi?id=59253

Previously, we stored the set of expected failures on the task object,
which meant the commit-queue forgot about them after each patch. This
patch moves them to the CommitQueue object so they will have a longer
lifetime.

• Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
• Scripts/webkitpy/tool/bot/patchanalysistask.py:
• Scripts/webkitpy/tool/commands/queues.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/tool/bot/patchanalysistask.py (modified) (3 diffs)
• Scripts/webkitpy/tool/commands/queues.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-22  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        CommitQueue should remember the expected failures from patch to patch
+        https://bugs.webkit.org/show_bug.cgi?id=59253
+
+        Previously, we stored the set of expected failures on the task object,
+        which meant the commit-queue forgot about them after each patch.  This
+        patch moves them to the CommitQueue object so they will have a longer
+        lifetime.
+
+        * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
+        * Scripts/webkitpy/tool/bot/patchanalysistask.py:
+        * Scripts/webkitpy/tool/commands/queues.py:
+
 2011-04-22  Sam Weinig  <sam@webkit.org>
 

trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

@@ -39 +39 @@
 from webkitpy.thirdparty.mock import Mock
 from webkitpy.tool.bot.commitqueuetask import *
+from webkitpy.tool.bot.expectedfailures import ExpectedFailures
 from webkitpy.tool.mocktool import MockTool
 
@@ -64 +65 @@
     def refetch_patch(self, patch):
         return patch
+
+    def expected_failures(self):
+        return ExpectedFailures()
 
     def layout_test_results(self):
@@ -377 +381 @@
                 return patch
 
+            def expected_failures(self):
+                return ExpectedFailures()
+
         task = CommitQueueTask(MockDelegate(), patch)
         self.assertEquals(task.validate(), is_valid)

trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py

@@ -29 +29 @@
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.net.layouttestresults import LayoutTestResults
-from webkitpy.tool.bot.expectedfailures import ExpectedFailures
 
 
@@ -46 +45 @@
 
     def refetch_patch(self, patch):
+        raise NotImplementedError("subclasses must implement")
+
+    def expected_failures(self):
         raise NotImplementedError("subclasses must implement")
 
@@ -65 +67 @@
         self._script_error = None
         self._results_archive_from_patch_test_run = None
-        self._expected_failures = ExpectedFailures()
+        self._expected_failures = delegate.expected_failures()
+        assert(self._expected_failures)
 
     def _run_command(self, command, success_message, failure_message):

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

@@ -46 +46 @@
 from webkitpy.tool.bot.botinfo import BotInfo
 from webkitpy.tool.bot.commitqueuetask import CommitQueueTask, CommitQueueTaskDelegate
+from webkitpy.tool.bot.expectedfailures import ExpectedFailures
 from webkitpy.tool.bot.feeders import CommitQueueFeeder, EWSFeeder
 from webkitpy.tool.bot.layouttestresultsreader import LayoutTestResultsReader
@@ -251 +252 @@
         AbstractPatchQueue.begin_work_queue(self)
         self.committer_validator = CommitterValidator(self._tool.bugs)
+        self._expected_failures = ExpectedFailures()
         self._layout_test_results_reader = LayoutTestResultsReader(self._tool, self._log_directory())
 
@@ -312 +314 @@
         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()