Merge WebKit at r67908: Initial merge by Git

Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972

3 files changed, 28 insertions, 8 deletions

diff --git a/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py b/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py
index 2b2258e..cc64fac 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py
@@ -175,6 +175,20 @@ class Bug(object):
     def is_unassigned(self):
         return self.assigned_to_email() in self.unassigned_emails
 
+    def status(self):
+        return self.bug_dictionary["bug_status"]
+
+    # Bugzilla has many status states we don't really use in WebKit:
+    # https://bugs.webkit.org/page.cgi?id=fields.html#status
+    _open_states = ["UNCONFIRMED", "NEW", "ASSIGNED", "REOPENED"]
+    _closed_states = ["RESOLVED", "VERIFIED", "CLOSED"]
+
+    def is_open(self):
+        return self.status() in self._open_states
+
+    def is_closed(self):
+        return not self.is_open()
+
     # Rarely do we actually want obsolete attachments
     def attachments(self, include_obsolete=False):
         attachments = self.bug_dictionary["attachments"]
@@ -357,15 +371,14 @@ class CommitterValidator(object):
             return False
         return True
 
+    def _reject_patch_if_flags_are_invalid(self, patch):
+        return (self._validate_setter_email(
+                patch, "reviewer", self.reject_patch_from_review_queue)
+            and self._validate_setter_email(
+                patch, "committer", self.reject_patch_from_commit_queue))
+
     def patches_after_rejecting_invalid_commiters_and_reviewers(self, patches):
-        validated_patches = []
-        for patch in patches:
-            if (self._validate_setter_email(
-                    patch, "reviewer", self.reject_patch_from_review_queue)
-                and self._validate_setter_email(
-                    patch, "committer", self.reject_patch_from_commit_queue)):
-                validated_patches.append(patch)
-        return validated_patches
+        return [patch for patch in patches if self._reject_patch_if_flags_are_invalid(patch)]
 
     def reject_patch_from_commit_queue(self,
                                        attachment_id,
@@ -500,6 +513,7 @@ class Bugzilla(object):
         bug = {}
         bug["id"] = int(soup.find("bug_id").string)
         bug["title"] = self._string_contents(soup.find("short_desc"))
+        bug["bug_status"] = self._string_contents(soup.find("bug_status"))
         bug["reporter_email"] = self._string_contents(soup.find("reporter"))
         bug["assigned_to_email"] = self._string_contents(soup.find("assigned_to"))
         bug["cc_emails"] = [self._string_contents(element)
diff --git a/WebKitTools/Scripts/webkitpy/common/net/bugzilla_unittest.py b/WebKitTools/Scripts/webkitpy/common/net/bugzilla_unittest.py
index 280696e..32f23cd 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/bugzilla_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/bugzilla_unittest.py
@@ -213,6 +213,7 @@ ZEZpbmlzaExvYWRXaXRoUmVhc29uOnJlYXNvbl07Cit9CisKIEBlbmQKIAogI2VuZGlmCg==
         "cc_emails" : ["foo@bar.com", "example@example.com"],
         "reporter_email" : "eric@webkit.org",
         "assigned_to_email" : "webkit-unassigned@lists.webkit.org",
+        "bug_status": "NEW",
         "attachments" : [{
             "attach_date": datetime.datetime(2009, 12, 27, 23, 51),
             'name': u'Patch',
diff --git a/WebKitTools/Scripts/webkitpy/common/net/statusserver.py b/WebKitTools/Scripts/webkitpy/common/net/statusserver.py
index c8fced6..57390b8 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/statusserver.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/statusserver.py
@@ -96,6 +96,11 @@ class StatusServer:
         self.browser["work_items"] = " ".join(work_items)
         return self.browser.submit().read()
 
+    def next_work_item(self, queue_name):
+        _log.debug("Fetching next work item for %s" % queue_name)
+        patch_status_url = "%s/next-patch/%s" % (self.url, queue_name)
+        return self._fetch_url(patch_status_url)
+
     def update_work_items(self, queue_name, work_items):
         _log.debug("Recording work items: %s for %s" % (work_items, queue_name))
         return NetworkTransaction().run(lambda: self._post_work_items_to_server(queue_name, work_items))