Changeset 70117 in webkit

Timestamp:

Oct 19, 2010 6:26:21 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-10-19 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Teach feeder-queue how to feed the EWS bots
​https://bugs.webkit.org/show_bug.cgi?id=47943

queues.webkit.org already knew how to accept EWS submissions
via /submit-to-ews. This teaches the feeder queue how to post
to that page with any new r? patches it sees.

• QueueStatusServer/model/activeworkitems_unitest.py: Added.
  • More unit testing is always a good thing.
• Scripts/webkitpy/common/net/bugzilla.py:
• Scripts/webkitpy/common/net/statusserver.py:
• Scripts/webkitpy/tool/bot/feeders.py:
• Scripts/webkitpy/tool/commands/queues.py:
• Scripts/webkitpy/tool/commands/queues_unittest.py:
• Scripts/webkitpy/tool/mocktool.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QueueStatusServer/model/activeworkitems_unitest.py (added)
• Scripts/webkitpy/common/net/bugzilla.py (modified) (2 diffs)
• Scripts/webkitpy/common/net/statusserver.py (modified) (1 diff)
• Scripts/webkitpy/tool/bot/feeders.py (modified) (4 diffs)
• Scripts/webkitpy/tool/commands/queues.py (modified) (3 diffs)
• Scripts/webkitpy/tool/commands/queues_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/mocktool.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-19  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Teach feeder-queue how to feed the EWS bots
+        https://bugs.webkit.org/show_bug.cgi?id=47943
+
+        queues.webkit.org already knew how to accept EWS submissions
+        via /submit-to-ews.  This teaches the feeder queue how to post
+        to that page with any new r? patches it sees.
+
+        * QueueStatusServer/model/activeworkitems_unitest.py: Added.
+         - More unit testing is always a good thing.
+        * Scripts/webkitpy/common/net/bugzilla.py:
+        * Scripts/webkitpy/common/net/statusserver.py:
+        * Scripts/webkitpy/tool/bot/feeders.py:
+        * Scripts/webkitpy/tool/commands/queues.py:
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+
 2010-10-19  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py

@@ -302 +302 @@
         return self._fetch_bug_ids_advanced_query(review_queue_url)
 
+    # This method will make several requests to bugzilla.
     def fetch_patches_from_review_queue(self, limit=None):
         # [:None] returns the whole array.
@@ -307 +308 @@
             for bug_id in self._fetch_bug_ids_from_review_queue()[:limit]], [])
 
-    # FIXME: Why do we have both fetch_patches_from_review_queue and
-    # fetch_attachment_ids_from_review_queue??
-    # NOTE: This is also the only client of _fetch_attachment_ids_request_query
-
+    # NOTE: This is the only client of _fetch_attachment_ids_request_query
+    # This method only makes one request to bugzilla.
     def fetch_attachment_ids_from_review_queue(self):
         review_queue_url = "request.cgi?action=queue&type=review&group=type"

trunk/WebKitTools/Scripts/webkitpy/common/net/statusserver.py

@@ -103 +103 @@
         return self._browser.submit().read()
 
+    def _post_work_item_to_ews(self, attachment_id):
+        submit_to_ews_url = "%s/submit-to-ews" % self.url
+        self._browser.open(submit_to_ews_url)
+        self._browser.select_form(name="submit_to_ews")
+        self._browser["attachment_id"] = unicode(attachment_id)
+        self._browser.submit()
+
+    def submit_to_ews(self, attachment_id):
+        _log.info("Submitting attachment %s to EWS queues" % attachment_id)
+        return NetworkTransaction().run(lambda: self._post_work_item_to_ews(attachment_id))
+
     def next_work_item(self, queue_name):
         _log.debug("Fetching next work item for %s" % queue_name)

trunk/WebKitTools/Scripts/webkitpy/tool/bot/feeders.py

@@ -29 +29 @@
 from webkitpy.common.system.deprecated_logging import log
 from webkitpy.common.net.bugzilla import CommitterValidator
+from webkitpy.tool.grammar import pluralize
 
 
@@ -35 +36 @@
         self._tool = tool
 
-    def feed(tool):
-        raise NotImplementedError, "subclasses must implement"
-
-    def update_work_items(self, item_ids):
-        self._tool.status_server.update_work_items(self.queue_name, item_ids)
-        log("Feeding %s items %s" % (self.queue_name, item_ids))
+    def feed(self):
+        raise NotImplementedError("subclasses must implement")
 
 
@@ -50 +47 @@
         self.committer_validator = CommitterValidator(self._tool.bugs)
 
+    def _update_work_items(self, item_ids):
+        self._tool.status_server.update_work_items(self.queue_name, item_ids)
+        log("Feeding %s items %s" % (self.queue_name, item_ids))
+
     def feed(self):
         patches = self._validate_patches()
         patches = sorted(patches, self._patch_cmp)
         patch_ids = [patch.id() for patch in patches]
-        self.update_work_items(patch_ids)
+        self._update_work_items(patch_ids)
 
     def _patches_for_bug(self, bug_id):
@@ -72 +73 @@
             return rollout_cmp
         return cmp(a.attach_date(), b.attach_date())
+
+
+class EWSFeeder(AbstractFeeder):
+    def __init__(self, tool):
+        self._ids_sent_to_server = set()
+        AbstractFeeder.__init__(self, tool)
+
+    def feed(self):
+        ids_needing_review = set(self._tool.bugs.queries.fetch_attachment_ids_from_review_queue())
+        new_ids = ids_needing_review.difference(self._ids_sent_to_server)
+        log("Feeding EWS (%s, %s new)" % (pluralize("r? patch", len(ids_needing_review)), len(new_ids)))
+        for attachment_id in new_ids:  # Order doesn't really matter for the EWS.
+            self._tool.status_server.submit_to_ews(attachment_id)
+            self._ids_sent_to_server.add(attachment_id)

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

@@ -46 +46 @@
 from webkitpy.tool.commands.stepsequence import StepSequenceErrorHandler
 from webkitpy.tool.bot.commitqueuetask import CommitQueueTask, CommitQueueTaskDelegate
-from webkitpy.tool.bot.feeders import CommitQueueFeeder
+from webkitpy.tool.bot.feeders import CommitQueueFeeder, EWSFeeder
 from webkitpy.tool.bot.patchcollection import PersistentPatchCollection, PersistentPatchCollectionDelegate
 from webkitpy.tool.bot.queueengine import QueueEngine, QueueEngineDelegate
@@ -168 +168 @@
         self.feeders = [
             CommitQueueFeeder(self._tool),
+            EWSFeeder(self._tool),
         ]
 
@@ -373 +374 @@
 
 class AbstractReviewQueue(AbstractPatchQueue, PersistentPatchCollectionDelegate, StepSequenceErrorHandler):
+    """This is the base-class for the EWS queues and the style-queue."""
     def __init__(self, options=None):
         AbstractPatchQueue.__init__(self, options)

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

@@ -136 +136 @@
 MOCK: update_work_items: commit-queue [106, 197]
 Feeding commit-queue items [106, 197]
+Feeding EWS (1 r? patch, 1 new)
+MOCK: submit_to_ews: 103
 """,
             "handle_unexpected_error": "Mock error message\n",

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

@@ -555 +555 @@
         log("MOCK: update_work_items: %s %s" % (queue_name, work_items))
 
+    def submit_to_ews(self, patch_id):
+        log("MOCK: submit_to_ews: %s" % (patch_id))
+
     def update_status(self, queue_name, status, patch=None, results_file=None):
         log("MOCK: update_status: %s %s" % (queue_name, status))