Changeset 52716 in webkit

Timestamp:

Jan 4, 2010, 1:30:11 AM (17 years ago)

Author:

abarth@webkit.org

Message:

2010-01-04 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Rename StatusBot to StatusServer
​https://bugs.webkit.org/show_bug.cgi?id=33139

It's not a bot. It's a server.

• Scripts/bugzilla-tool:
• Scripts/webkitpy/bugzilla.py:
• Scripts/webkitpy/commands/early_warning_system.py:
• Scripts/webkitpy/commands/queues.py:
• Scripts/webkitpy/mock_bugzillatool.py:
• Scripts/webkitpy/queueengine.py:
• Scripts/webkitpy/statusbot.py: Removed.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (2 diffs)
• Scripts/webkitpy/bugzilla.py (modified) (1 diff)
• Scripts/webkitpy/commands/early_warning_system.py (modified) (1 diff)
• Scripts/webkitpy/commands/queues.py (modified) (6 diffs)
• Scripts/webkitpy/mock_bugzillatool.py (modified) (2 diffs)
• Scripts/webkitpy/queueengine.py (modified) (1 diff)
• Scripts/webkitpy/statusserver.py (moved) (moved from trunk/WebKitTools/Scripts/webkitpy/statusbot.py ) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-04  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Rename StatusBot to StatusServer
+        https://bugs.webkit.org/show_bug.cgi?id=33139
+
+        It's not a bot.  It's a server.
+
+        * Scripts/bugzilla-tool:
+        * Scripts/webkitpy/bugzilla.py:
+        * Scripts/webkitpy/commands/early_warning_system.py:
+        * Scripts/webkitpy/commands/queues.py:
+        * Scripts/webkitpy/mock_bugzillatool.py:
+        * Scripts/webkitpy/queueengine.py:
+        * Scripts/webkitpy/statusbot.py: Removed.
+
 2010-01-04  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -61 +61 @@
         self.user = User()
         self._scm = None
-        self.status_bot = StatusBot()
+        self.status_server = StatusServer()
 
     def scm(self):
@@ -96 +96 @@
             self.bugs.dryrun = True
         if options.status_host:
-            self.status_bot.set_host(options.status_host)
+            self.status_server.set_host(options.status_host)
 
     def should_execute_command(self, command):

trunk/WebKitTools/Scripts/webkitpy/bugzilla.py

@@ -258 +258 @@
         committer_list = "WebKitTools/Scripts/webkitpy/committers.py" # This could be computed from CommitterList.__file__
         contribution_guidlines_url = "http://webkit.org/coding/contributing.html" # Should come from some webkit_config.py
-        queue_administrator = "eseidel@chromium.org" # This could be queried from the status_bot.
+        queue_administrator = "eseidel@chromium.org" # This could be queried from the status_server.
         queue_name = "commit-queue" # This could be queried from the tool.
         rejection_message = "%s does not have %s permissions according to %s." % (setter_email, flag_name, self._view_source_link(committer_list))

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

@@ -72 +72 @@
         if not script_error.command_name() == "build-webkit":
             return
-        results_link = tool.status_bot.results_url_for_status(status_id)
+        results_link = tool.status_server.results_url_for_status(status_id)
         message = "Attachment %s did not build on %s:\nBuild output: %s" % (state["patch"]["id"], cls.port_name, results_link)
         tool.bugs.post_comment_to_bug(state["patch"]["bug_id"], message, cc=cls.watchers)

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

@@ -40 +40 @@
 from webkitpy.multicommandtool import Command
 from webkitpy.patchcollection import PersistentPatchCollection, PersistentPatchCollectionDelegate
-from webkitpy.statusbot import StatusBot
+from webkitpy.statusserver import StatusServer
 from webkitpy.stepsequence import StepSequenceErrorHandler
 from webkitpy.queueengine import QueueEngine, QueueEngineDelegate
@@ -66 +66 @@
 
     def _update_status(self, message, patch=None, results_file=None):
-        self.tool.status_bot.update_status(self.name, message, patch, results_file)
+        self.tool.status_server.update_status(self.name, message, patch, results_file)
 
     def _did_pass(self, patch):
@@ -110 +110 @@
         bugzilla_tool_args = [self.tool.path()]
         # FIXME: This is a hack, we should have a more general way to pass global options.
-        bugzilla_tool_args += ["--status-host=%s" % self.tool.status_bot.statusbot_host]
+        bugzilla_tool_args += ["--status-host=%s" % self.tool.status_server.host]
         bugzilla_tool_args += map(str, args)
         self.tool.executive.run_and_throw_if_fail(bugzilla_tool_args)
@@ -124 +124 @@
     @classmethod
     def _update_status_for_script_error(cls, tool, state, script_error):
-        return tool.status_bot.update_status(cls.name, script_error.message, state["patch"], StringIO(script_error.output))
+        return tool.status_server.update_status(cls.name, script_error.message, state["patch"], StringIO(script_error.output))
 
 
@@ -173 +173 @@
         if not script_error.output:
             return script_error.message_with_output()
-        results_link = tool.status_bot.results_url_for_status(status_id)
+        results_link = tool.status_server.results_url_for_status(status_id)
         return "%s\nFull output: %s" % (script_error.message_with_output(), results_link)
 
@@ -195 +195 @@
 
     def status_server(self):
-        return self.tool.status_bot
+        return self.tool.status_server
 
     # AbstractQueue methods

trunk/WebKitTools/Scripts/webkitpy/mock_bugzillatool.py

@@ -191 +191 @@
 
 
-class MockStatusBot(object):
+class MockStatusServer(object):
     def __init__(self):
-        self.statusbot_host = "example.com"
+        self.host = "example.com"
 
     def patch_status(self, queue_name, patch_id):
@@ -209 +209 @@
         self.user = MockUser()
         self._scm = MockSCM()
-        self.status_bot = MockStatusBot()
+        self.status_server = MockStatusServer()
 
     def scm(self):

trunk/WebKitTools/Scripts/webkitpy/queueengine.py

@@ -37 +37 @@
 from webkitpy.executive import ScriptError
 from webkitpy.webkit_logging import log, OutputTee
-from webkitpy.statusbot import StatusBot
+from webkitpy.statusserver import StatusServer
 
 class QueueEngineDelegate:

trunk/WebKitTools/Scripts/webkitpy/statusserver.py

@@ -39 +39 @@
 
 
-class StatusBot:
+class StatusServer:
     default_host = "webkit-commit-queue.appspot.com"
 
@@ -47 +47 @@
 
     def set_host(self, host):
-        self.statusbot_host = host
-        self.statusbot_server_url = "http://%s" % self.statusbot_host
+        self.host = host
+        self.url = "http://%s" % self.host
 
     def results_url_for_status(self, status_id):
-        return "%s/results/%s" % (self.statusbot_server_url, status_id)
+        return "%s/results/%s" % (self.url, status_id)
 
     def update_status(self, queue_name, status, patch=None, results_file=None):
-        # During unit testing, statusbot_host is None
-        if not self.statusbot_host:
+        # During unit testing, host is None
+        if not self.host:
             return
 
         log(status)
-        update_status_url = "%s/update-status" % self.statusbot_server_url
+        update_status_url = "%s/update-status" % self.url
         self.browser.open(update_status_url)
         self.browser.select_form(name="update_status")
@@ -75 +75 @@
 
     def patch_status(self, queue_name, patch_id):
-        update_status_url = "%s/patch-status/%s/%s" % (self.statusbot_server_url, queue_name, patch_id)
+        update_status_url = "%s/patch-status/%s/%s" % (self.url, queue_name, patch_id)
         try:
             return urllib2.urlopen(update_status_url).read()