Changeset 56874 in webkit

Timestamp:

Mar 31, 2010 3:55:40 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-31 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Teach buildbot.py how to parse builder activity from /one_box_per_builder
​https://bugs.webkit.org/show_bug.cgi?id=36898

I also removed some obsolete FIXMEs and
refactored one_box_per_builder parsing into multiple
methods for easier reading.

• Scripts/webkitpy/common/net/buildbot.py:
• Scripts/webkitpy/common/net/buildbot_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/buildbot.py (modified) (3 diffs)
• Scripts/webkitpy/common/net/buildbot_unittest.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-31  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Teach buildbot.py how to parse builder activity from /one_box_per_builder
+        https://bugs.webkit.org/show_bug.cgi?id=36898
+
+        I also removed some obsolete FIXMEs and
+        refactored one_box_per_builder parsing into multiple
+        methods for easier reading.
+
+        * Scripts/webkitpy/common/net/buildbot.py:
+        * Scripts/webkitpy/common/net/buildbot_unittest.py:
+
 2010-03-31  Dirk Pranke  <dpranke@chromium.org>
 

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

@@ -263 +263 @@
         ]
 
-    # FIXME: This should create and return Buidler and Build objects instead
-    # of a custom dictionary.
-    def _parse_builder_status_from_row(self, status_row):
-        # If WebKit's buildbot has an XMLRPC interface we could use, we could
-        # do something more sophisticated here.  For now we just parse out the
-        # basics, enough to support basic questions like "is the tree green?"
-        status_cells = status_row.findAll('td')
-        builder = {}
-
-        name_link = status_cells[0].find('a')
-        builder['name'] = name_link.string
-
-        status_link = status_cells[1].find('a')
-        if not status_link:
+    def _parse_last_build_cell(self, builder, cell):
+        status_link = cell.find('a')
+        if status_link:
+            # Will be either a revision number or a build number
+            revision_string = status_link.string
+            # If revision_string has non-digits assume it's not a revision number.
+            builder['built_revision'] = int(revision_string) \
+                                        if not re.match('\D', revision_string) \
+                                        else None
+            builder['is_green'] = not re.search('fail', cell.renderContents())
+
+            status_link_regexp = r"builders/(?P<builder_name>.*)/builds/(?P<build_number>\d+)"
+            link_match = re.match(status_link_regexp, status_link['href'])
+            builder['build_number'] = int(link_match.group("build_number"))
+        else:
             # We failed to find a link in the first cell, just give up.  This
             # can happen if a builder is just-added, the first cell will just
@@ -282 +283 @@
             # Other parts of the code depend on is_green being present.
             builder['is_green'] = False
-            return builder
-        # Will be either a revision number or a build number
-        revision_string = status_link.string
-        # If revision_string has non-digits assume it's not a revision number.
-        builder['built_revision'] = int(revision_string) \
-                                    if not re.match('\D', revision_string) \
-                                    else None
-        builder['is_green'] = not re.search('fail',
-                                            status_cells[1].renderContents())
-
-        status_link_regexp = r"builders/(?P<builder_name>.*)/builds/(?P<build_number>\d+)"
-        link_match = re.match(status_link_regexp, status_link['href'])
-        builder['build_number'] = int(link_match.group("build_number"))
-
-        # We could parse out the current activity too.
+            builder['built_revision'] = None
+            builder['build_number'] = None
+
+    def _parse_current_build_cell(self, builder, cell):
+        activity_lines = cell.renderContents().split("<br />")
+        builder["activity"] = activity_lines[0] # normally "building" or "idle"
+        # The middle lines document how long left for any current builds.
+        match = re.match("(?P<pending_builds>\d) pending", activity_lines[-1])
+        builder["pending_builds"] = int(match.group("pending_builds")) if match else 0
+
+    def _parse_builder_status_from_row(self, status_row):
+        status_cells = status_row.findAll('td')
+        builder = {}
+
+        # First cell is the name
+        name_link = status_cells[0].find('a')
+        builder["name"] = name_link.string
+
+        self._parse_last_build_cell(builder, status_cells[1])
+        self._parse_current_build_cell(builder, status_cells[2])
         return builder
 
@@ -361 +367 @@
         return [self.builder_with_name(status["name"]) for status in self.builder_statuses()]
 
+    # This method pulls from /one_box_per_builder as an efficient way to get information about
     def builder_statuses(self):
         soup = BeautifulSoup(self._fetch_one_box_per_builder())

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

@@ -138 +138 @@
     <td class="box"><a href="builders/Qt%20Linux%20Release">Qt Linux Release</a></td>
       <td align="center" class="LastBuild box failure"><a href="builders/Qt%20Linux%20Release/builds/654">47383</a><br />failed<br />compile-webkit</td>
-      <td align="center" class="Activity idle">idle</td>
+      <td align="center" class="Activity idle">idle<br />3 pending</td>
     </table>
 '''
@@ -146 +146 @@
             'build_number' : 3693,
             'name': u'Windows Debug (Tests)',
-            'built_revision': 47380
+            'built_revision': 47380,
+            'activity': 'building',
+            'pending_builds': 0,
         },
         {
             'is_green': False,
+            'build_number' : None,
             'name': u'SnowLeopard Intel Release',
+            'built_revision': None,
+            'activity': 'building',
+            'pending_builds': 0,
         },
         {
@@ -156 +162 @@
             'build_number' : 654,
             'name': u'Qt Linux Release',
-            'built_revision': 47383
+            'built_revision': 47383,
+            'activity': 'idle',
+            'pending_builds': 3,
         },
     ]