Changeset 52716 in webkit
- Timestamp:
- Jan 4, 2010 1:30:11 AM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 7 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r52715 r52716 1 2010-01-04 Adam Barth <abarth@webkit.org> 2 3 Reviewed by Eric Seidel. 4 5 Rename StatusBot to StatusServer 6 https://bugs.webkit.org/show_bug.cgi?id=33139 7 8 It's not a bot. It's a server. 9 10 * Scripts/bugzilla-tool: 11 * Scripts/webkitpy/bugzilla.py: 12 * Scripts/webkitpy/commands/early_warning_system.py: 13 * Scripts/webkitpy/commands/queues.py: 14 * Scripts/webkitpy/mock_bugzillatool.py: 15 * Scripts/webkitpy/queueengine.py: 16 * Scripts/webkitpy/statusbot.py: Removed. 17 1 18 2010-01-04 Adam Barth <abarth@webkit.org> 2 19 -
trunk/WebKitTools/Scripts/bugzilla-tool
r52703 r52716 61 61 self.user = User() 62 62 self._scm = None 63 self.status_ bot = StatusBot()63 self.status_server = StatusServer() 64 64 65 65 def scm(self): … … 96 96 self.bugs.dryrun = True 97 97 if options.status_host: 98 self.status_ bot.set_host(options.status_host)98 self.status_server.set_host(options.status_host) 99 99 100 100 def should_execute_command(self, command): -
trunk/WebKitTools/Scripts/webkitpy/bugzilla.py
r52704 r52716 258 258 committer_list = "WebKitTools/Scripts/webkitpy/committers.py" # This could be computed from CommitterList.__file__ 259 259 contribution_guidlines_url = "http://webkit.org/coding/contributing.html" # Should come from some webkit_config.py 260 queue_administrator = "eseidel@chromium.org" # This could be queried from the status_ bot.260 queue_administrator = "eseidel@chromium.org" # This could be queried from the status_server. 261 261 queue_name = "commit-queue" # This could be queried from the tool. 262 262 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
r52703 r52716 72 72 if not script_error.command_name() == "build-webkit": 73 73 return 74 results_link = tool.status_ bot.results_url_for_status(status_id)74 results_link = tool.status_server.results_url_for_status(status_id) 75 75 message = "Attachment %s did not build on %s:\nBuild output: %s" % (state["patch"]["id"], cls.port_name, results_link) 76 76 tool.bugs.post_comment_to_bug(state["patch"]["bug_id"], message, cc=cls.watchers) -
trunk/WebKitTools/Scripts/webkitpy/commands/queues.py
r52703 r52716 40 40 from webkitpy.multicommandtool import Command 41 41 from webkitpy.patchcollection import PersistentPatchCollection, PersistentPatchCollectionDelegate 42 from webkitpy.status bot import StatusBot42 from webkitpy.statusserver import StatusServer 43 43 from webkitpy.stepsequence import StepSequenceErrorHandler 44 44 from webkitpy.queueengine import QueueEngine, QueueEngineDelegate … … 66 66 67 67 def _update_status(self, message, patch=None, results_file=None): 68 self.tool.status_ bot.update_status(self.name, message, patch, results_file)68 self.tool.status_server.update_status(self.name, message, patch, results_file) 69 69 70 70 def _did_pass(self, patch): … … 110 110 bugzilla_tool_args = [self.tool.path()] 111 111 # FIXME: This is a hack, we should have a more general way to pass global options. 112 bugzilla_tool_args += ["--status-host=%s" % self.tool.status_ bot.statusbot_host]112 bugzilla_tool_args += ["--status-host=%s" % self.tool.status_server.host] 113 113 bugzilla_tool_args += map(str, args) 114 114 self.tool.executive.run_and_throw_if_fail(bugzilla_tool_args) … … 124 124 @classmethod 125 125 def _update_status_for_script_error(cls, tool, state, script_error): 126 return tool.status_ bot.update_status(cls.name, script_error.message, state["patch"], StringIO(script_error.output))126 return tool.status_server.update_status(cls.name, script_error.message, state["patch"], StringIO(script_error.output)) 127 127 128 128 … … 173 173 if not script_error.output: 174 174 return script_error.message_with_output() 175 results_link = tool.status_ bot.results_url_for_status(status_id)175 results_link = tool.status_server.results_url_for_status(status_id) 176 176 return "%s\nFull output: %s" % (script_error.message_with_output(), results_link) 177 177 … … 195 195 196 196 def status_server(self): 197 return self.tool.status_ bot197 return self.tool.status_server 198 198 199 199 # AbstractQueue methods -
trunk/WebKitTools/Scripts/webkitpy/mock_bugzillatool.py
r52715 r52716 191 191 192 192 193 class MockStatus Bot(object):193 class MockStatusServer(object): 194 194 def __init__(self): 195 self. statusbot_host = "example.com"195 self.host = "example.com" 196 196 197 197 def patch_status(self, queue_name, patch_id): … … 209 209 self.user = MockUser() 210 210 self._scm = MockSCM() 211 self.status_ bot = MockStatusBot()211 self.status_server = MockStatusServer() 212 212 213 213 def scm(self): -
trunk/WebKitTools/Scripts/webkitpy/queueengine.py
r52703 r52716 37 37 from webkitpy.executive import ScriptError 38 38 from webkitpy.webkit_logging import log, OutputTee 39 from webkitpy.status bot import StatusBot39 from webkitpy.statusserver import StatusServer 40 40 41 41 class QueueEngineDelegate: -
trunk/WebKitTools/Scripts/webkitpy/statusserver.py
r52715 r52716 39 39 40 40 41 class Status Bot:41 class StatusServer: 42 42 default_host = "webkit-commit-queue.appspot.com" 43 43 … … 47 47 48 48 def set_host(self, host): 49 self. statusbot_host = host50 self. statusbot_server_url = "http://%s" % self.statusbot_host49 self.host = host 50 self.url = "http://%s" % self.host 51 51 52 52 def results_url_for_status(self, status_id): 53 return "%s/results/%s" % (self. statusbot_server_url, status_id)53 return "%s/results/%s" % (self.url, status_id) 54 54 55 55 def update_status(self, queue_name, status, patch=None, results_file=None): 56 # During unit testing, statusbot_host is None57 if not self. statusbot_host:56 # During unit testing, host is None 57 if not self.host: 58 58 return 59 59 60 60 log(status) 61 update_status_url = "%s/update-status" % self. statusbot_server_url61 update_status_url = "%s/update-status" % self.url 62 62 self.browser.open(update_status_url) 63 63 self.browser.select_form(name="update_status") … … 75 75 76 76 def patch_status(self, queue_name, patch_id): 77 update_status_url = "%s/patch-status/%s/%s" % (self. statusbot_server_url, queue_name, patch_id)77 update_status_url = "%s/patch-status/%s/%s" % (self.url, queue_name, patch_id) 78 78 try: 79 79 return urllib2.urlopen(update_status_url).read()
Note: See TracChangeset
for help on using the changeset viewer.