summaryrefslogtreecommitdiff
path: root/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
commit2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch)
tree988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py
parentdd91e772430dc294e3bf478c119ef8d43c0a3358 (diff)
downloadqtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py')
-rw-r--r--Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py b/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py
index 8b2d5c2c2..491ba79da 100644
--- a/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py
+++ b/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py
@@ -33,6 +33,9 @@ class CommitQueueTaskDelegate(PatchAnalysisTaskDelegate):
def parent_command(self):
return "commit-queue"
+ def did_pass_testing_ews(self, patch):
+ raise NotImplementedError("subclasses must implement")
+
class CommitQueueTask(PatchAnalysisTask):
def validate(self):
@@ -58,6 +61,11 @@ class CommitQueueTask(PatchAnalysisTask):
"ChangeLog validated",
"ChangeLog did not pass validation")
+ def _did_pass_tests_recently(self):
+ if self._delegate.did_pass_testing_ews(self._patch):
+ return True
+ return self._test_patch()
+
def run(self):
if not self.validate():
return False
@@ -74,7 +82,7 @@ class CommitQueueTask(PatchAnalysisTask):
if not self._build_without_patch():
return False
return self.report_failure()
- if not self._test_patch():
+ if not self._did_pass_tests_recently():
return False
# Make sure the patch is still valid before landing (e.g., make sure
# no one has set commit-queue- since we started working on the patch.)