Changeset 90513 in webkit

Timestamp:

Jul 6, 2011 4:34:21 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-07-06 Adam Barth <​abarth@webkit.org>

Move buildbot URL in webkitpy to config.urls
​https://bugs.webkit.org/show_bug.cgi?id=64041

Reviewed by Eric Seidel.

This patch prepares for using the buildbot class to talk to the
Chromium buildbots.

• Scripts/webkitpy/common/config/urls.py:
• Scripts/webkitpy/common/net/buildbot/buildbot.py:
• Scripts/webkitpy/tool/commands/download_unittest.py:
• Scripts/webkitpy/tool/commands/queries.py:
• Scripts/webkitpy/tool/mocktool.py:
• Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/config/urls.py (modified) (1 diff)
• Scripts/webkitpy/common/net/buildbot/buildbot.py (modified) (6 diffs)
• Scripts/webkitpy/tool/commands/download_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/queries.py (modified) (6 diffs)
• Scripts/webkitpy/tool/mocktool.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-06  Adam Barth  <abarth@webkit.org>
+
+        Move buildbot URL in webkitpy to config.urls
+        https://bugs.webkit.org/show_bug.cgi?id=64041
+
+        Reviewed by Eric Seidel.
+
+        This patch prepares for using the buildbot class to talk to the
+        Chromium buildbots.
+
+        * Scripts/webkitpy/common/config/urls.py:
+        * Scripts/webkitpy/common/net/buildbot/buildbot.py:
+        * Scripts/webkitpy/tool/commands/download_unittest.py:
+        * Scripts/webkitpy/tool/commands/queries.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+        * Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py:
+
 2011-07-06  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/Tools/Scripts/webkitpy/common/config/urls.py

@@ -49 +49 @@
 bug_url_long = _bug_server_regex + r"show_bug\.cgi\?id=(?P<bug_id>\d+)(&ctype=xml)?"
 bug_url_short = r"https?\://webkit\.org/b/(?P<bug_id>\d+)"
+
+buildbot_url = "http://build.webkit.org"
+chromium_buildbot_url = "http://build.chromium.org/p/chromium.webkit"

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

@@ -40 +40 @@
 import urllib2
 
+import webkitpy.common.config.urls as config_urls
 from webkitpy.common.net.failuremap import FailureMap
 from webkitpy.common.net.layouttestresults import LayoutTestResults
@@ -67 +68 @@
 
     def results_url(self):
-        return "http://%s/results/%s" % (self._buildbot.buildbot_host, self.url_encoded_name())
+        return "%s/results/%s" % (self._buildbot.buildbot_url, self.url_encoded_name())
 
     def url_encoded_name(self):
@@ -73 +74 @@
 
     def url(self):
-        return "http://%s/builders/%s" % (self._buildbot.buildbot_host, self.url_encoded_name())
+        return "%s/builders/%s" % (self._buildbot.buildbot_url, self.url_encoded_name())
 
     # This provides a single place to mock
@@ -280 +281 @@
 
 class BuildBot(object):
-    # FIXME: This should move into common.config.urls.
-    default_host = "build.webkit.org"
-
-    def __init__(self, host=default_host):
-        self.buildbot_host = host
+    def __init__(self, url=config_urls.buildbot_url):
+        self.buildbot_url = url
         self._builder_by_name = {}
 
@@ -386 +384 @@
         # FIXME: The bot sends a *huge* amount of data for each request, we should
         # find a way to reduce the response size further.
-        json_url = "http://%s/json/builders/%s/builds/%s?filter=1" % (self.buildbot_host, urllib.quote(builder.name()), build_number)
+        json_url = "%s/json/builders/%s/builds/%s?filter=1" % (self.buildbot_url, urllib.quote(builder.name()), build_number)
         try:
             return json.load(urllib2.urlopen(json_url))
@@ -399 +397 @@
 
     def _fetch_one_box_per_builder(self):
-        build_status_url = "http://%s/one_box_per_builder" % self.buildbot_host
+        build_status_url = "%s/one_box_per_builder" % self.buildbot_url
         return urllib2.urlopen(build_status_url)
 

trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py

@@ -118 +118 @@
 
     def test_land_red_builders(self):
-        expected_stderr = '\nWARNING: Builders ["Builder2"] are red, please watch your commit carefully.\nSee http://dummy_buildbot_host/console?category=core\n\nBuilding WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning Bindings tests\nRunning JavaScriptCore tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 42\n'
+        expected_stderr = '\nWARNING: Builders ["Builder2"] are red, please watch your commit carefully.\nSee http://build.webkit.org/console?category=core\n\nBuilding WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning Bindings tests\nRunning JavaScriptCore tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 42\n'
         mock_tool = MockTool()
         mock_tool.buildbot.light_tree_on_fire()

trunk/Tools/Scripts/webkitpy/tool/commands/queries.py

@@ -35 +35 @@
 from webkitpy.common.checkout.commitinfo import CommitInfo
 from webkitpy.common.config.committers import CommitterList
+import webkitpy.common.config.urls as config_urls
 from webkitpy.common.net.buildbot import BuildBot
 from webkitpy.common.net.regressionwindow import RegressionWindow
@@ -136 +137 @@
 class WhatBroke(AbstractDeclarativeCommand):
     name = "what-broke"
-    help_text = "Print failing buildbots (%s) and what revisions broke them" % BuildBot.default_host
+    help_text = "Print failing buildbots (%s) and what revisions broke them" % config_urls.buildbot_url
 
     def _print_builder_line(self, builder_name, max_name_width, status_message):
@@ -182 +183 @@
 class ResultsFor(AbstractDeclarativeCommand):
     name = "results-for"
-    help_text = "Print a list of failures for the passed revision from bots on %s" % BuildBot.default_host
+    help_text = "Print a list of failures for the passed revision from bots on %s" % config_urls.buildbot_url
     argument_names = "REVISION"
 
@@ -204 +205 @@
 class FailureReason(AbstractDeclarativeCommand):
     name = "failure-reason"
-    help_text = "Lists revisions where individual test failures started at %s" % BuildBot.default_host
+    help_text = "Lists revisions where individual test failures started at %s" % config_urls.buildbot_url
 
     def _blame_line_for_revision(self, revision):
@@ -290 +291 @@
 class FindFlakyTests(AbstractDeclarativeCommand):
     name = "find-flaky-tests"
-    help_text = "Lists tests that often fail for a single build at %s" % BuildBot.default_host
+    help_text = "Lists tests that often fail for a single build at %s" % config_urls.buildbot_url
 
     def _find_failures(self, builder, revision):
@@ -359 +360 @@
 class TreeStatus(AbstractDeclarativeCommand):
     name = "tree-status"
-    help_text = "Print the status of the %s buildbots" % BuildBot.default_host
+    help_text = "Print the status of the %s buildbots" % config_urls.buildbot_url
     long_help = """Fetches build status from http://build.webkit.org/one_box_per_builder
 and displayes the status of each builder."""

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

@@ -418 +418 @@
 
 class MockBuildBot(object):
-    buildbot_host = "dummy_buildbot_host"
     def __init__(self):
         self._mock_builder1_status = {

trunk/Tools/Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py

@@ -29 +29 @@
 from webkitpy.tool.steps.abstractstep import AbstractStep
 from webkitpy.tool.steps.options import Options
+import webkitpy.common.config.urls as config_urls
 from webkitpy.common.system.deprecated_logging import log, error
 
@@ -46 +47 @@
             return
         red_builders_names = map(lambda name: "\"%s\"" % name, red_builders_names) # Add quotes around the names.
-        log("\nWARNING: Builders [%s] are red, please watch your commit carefully.\nSee http://%s/console?category=core\n" % (", ".join(red_builders_names), self._tool.buildbot.buildbot_host))
+        log("\nWARNING: Builders [%s] are red, please watch your commit carefully.\nSee %s/console?category=core\n" % (", ".join(red_builders_names), config_urls.buildbot_url))