Changeset 56225 in webkit

Timestamp:

Mar 19, 2010 12:37:35 AM (14 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Adam Barth.

Simplify BuildBot core builder code for easier re-use
​https://bugs.webkit.org/show_bug.cgi?id=36350

I simply couldn't see anything through all this Yak-hair.

• Scripts/webkitpy/buildbot.py:
• Scripts/webkitpy/commands/queries.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/buildbot.py (modified) (1 diff)
• Scripts/webkitpy/commands/queries.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-19  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Simplify BuildBot core builder code for easier re-use
+        https://bugs.webkit.org/show_bug.cgi?id=36350
+
+        I simply couldn't see anything through all this Yak-hair.
+
+        * Scripts/webkitpy/buildbot.py:
+        * Scripts/webkitpy/commands/queries.py:
+
 2010-03-19  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/buildbot.py

@@ -172 +172 @@
         return builder
 
-    def _builder_statuses_with_names_matching_regexps(self,
-                                                      builder_statuses,
-                                                      name_regexps):
-        builders = []
-        for builder in builder_statuses:
-            for name_regexp in name_regexps:
-                if re.match(name_regexp, builder['name']):
-                    builders.append(builder)
-        return builders
+    def _matches_regexps(self, builder_name, name_regexps):
+        for name_regexp in name_regexps:
+            if re.match(name_regexp, builder_name):
+                return True
+        return False
+
+    # FIXME: Should move onto Builder
+    def _is_core_builder(self, builder_name):
+        return self._matches_regexps(builder_name, self.core_builder_names_regexps)
+
+    # FIXME: This method needs to die, but is used by a unit test at the moment.
+    def _builder_statuses_with_names_matching_regexps(self, builder_statuses, name_regexps):
+        return [builder for builder in builder_statuses if self._matches_regexps(builder["name"], name_regexps)]
 
     def red_core_builders(self):
-        red_builders = []
-        for builder in self._builder_statuses_with_names_matching_regexps(
-                               self.builder_statuses(),
-                               self.core_builder_names_regexps):
-            if not builder['is_green']:
-                red_builders.append(builder)
-        return red_builders
+        return [builder for builder in self.builder_statuses() if not builder["is_green"] and self._is_core_builder(builder["name"])]
 
     def red_core_builders_names(self):

trunk/WebKitTools/Scripts/webkitpy/commands/queries.py

@@ -143 +143 @@
             self._print_blame_information_for_commit(commit_info)
 
+    def revisions_causing_failures(self, only_core_builders=True):
+        builder_statuses = tool.buildbot.builder_statuses()
+
     def execute(self, options, args, tool):
         builder_statuses = tool.buildbot.builder_statuses()