Changeset 51622 in webkit

Timestamp:

Dec 2, 2009 9:31:48 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-02 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

REGRESSION(51595): commit-queue is throwing exceptions
​https://bugs.webkit.org/show_bug.cgi?id=32083

• Scripts/modules/commands/queues.py:
  • Don't use default value of [] as it ends up getting shared.
  • Make log_progress accept arrays of ints as well as strings.
  • Return an exit code from execute()
• Scripts/modules/commands/queues_unittest.py: Added.
  • Test to make sure log_progress will accept ints.
  • Test to make sure run_bugzilla_tool will accept ints.
• Scripts/modules/workqueue.py:
  • Print the stack trace on unexpected exceptions for easier debugging.
• Scripts/run-webkit-unittests:
  • Add queues_unittest.

• Scripts/modules/commands/queues.py:
• Scripts/modules/commands/queues_unittest.py: Copied from WebKitTools/Scripts/modules/commands/commandtest.py.
• Scripts/modules/mock_bugzillatool.py:
• Scripts/modules/workqueue.py:
• Scripts/run-webkit-unittests:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/commands/queues.py (modified) (4 diffs)
• Scripts/modules/commands/queues_unittest.py (added)
• Scripts/modules/mock_bugzillatool.py (modified) (1 diff)
• Scripts/modules/workqueue.py (modified) (2 diffs)
• Scripts/run-webkit-unittests (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-02  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        REGRESSION(51595): commit-queue is throwing exceptions
+        https://bugs.webkit.org/show_bug.cgi?id=32083
+
+        * Scripts/modules/commands/queues.py:
+         - Don't use default value of [] as it ends up getting shared.
+         - Make log_progress accept arrays of ints as well as strings.
+         - Return an exit code from execute()
+        * Scripts/modules/commands/queues_unittest.py: Added.
+         - Test to make sure log_progress will accept ints.
+         - Test to make sure run_bugzilla_tool will accept ints.
+        * Scripts/modules/workqueue.py:
+         - Print the stack trace on unexpected exceptions for easier debugging.
+        * Scripts/run-webkit-unittests:
+         - Add queues_unittest.
+
+        * Scripts/modules/commands/queues.py:
+        * Scripts/modules/commands/queues_unittest.py: Copied from WebKitTools/Scripts/modules/commands/commandtest.py.
+        * Scripts/modules/mock_bugzillatool.py:
+        * Scripts/modules/workqueue.py:
+        * Scripts/run-webkit-unittests:
+
 2009-12-02  David Levin  <levin@chromium.org>
 

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

@@ -47 +47 @@
 class AbstractQueue(Command, WorkQueueDelegate):
     watchers = "webkit-bot-watchers@googlegroups.com"
-    def __init__(self, options=[]):
-        options += [
+    def __init__(self, options=None): # Default values should never be collections (like []) as default values are shared between invocations
+        options_list = (options or []) + [
             make_option("--no-confirm", action="store_false", dest="confirm", default=True, help="Do not ask the user for confirmation before running the queue.  Dangerous!"),
             make_option("--status-host", action="store", type="string", dest="status_host", default=StatusBot.default_host, help="Hostname (e.g. localhost or commit.webkit.org) where status updates should be posted."),
         ]
-        Command.__init__(self, "Run the %s" % self.name, options=options)
+        Command.__init__(self, "Run the %s" % self.name, options=options_list)
 
     def _cc_watchers(self, bug_id):
@@ -93 +93 @@
 
     def run_bugzilla_tool(self, args):
-        bugzilla_tool_args = [self.tool.path()] + args
+        bugzilla_tool_args = [self.tool.path()] + map(str, args)
         run_and_throw_if_fail(bugzilla_tool_args)
 
     def log_progress(self, patch_ids):
-        log("%s in %s [%s]" % (pluralize("patch", len(patch_ids)), self.name, ", ".join(patch_ids)))
+        log("%s in %s [%s]" % (pluralize("patch", len(patch_ids)), self.name, ", ".join(map(str, patch_ids))))
 
     def execute(self, options, args, tool):
@@ -103 +103 @@
         self.tool = tool
         work_queue = WorkQueue(self.name, self)
-        work_queue.run()
+        return work_queue.run()
 
 
@@ -147 +147 @@
 
 class AbstractTryQueue(AbstractQueue, PersistentPatchCollectionDelegate, LandingSequenceErrorHandler):
-    def __init__(self, options=[]):
+    def __init__(self, options=None):
         AbstractQueue.__init__(self, options)
 

trunk/WebKitTools/Scripts/modules/mock_bugzillatool.py

@@ -131 +131 @@
     def scm(self):
         return self._scm
+
+    def path(self):
+        return "echo"

trunk/WebKitTools/Scripts/modules/workqueue.py

@@ -31 +31 @@
 import os
 import time
+import traceback
 
 from datetime import datetime, timedelta
@@ -105 +106 @@
                     continue
                 self.status_bot.update_status(self._name, waiting_message, patch)
+            except KeyboardInterrupt, e:
+                log("\nUser terminated queue.")
+                return 1
             except Exception, e:
+                traceback.print_exc()
                 # Don't try tell the status bot, in case telling it causes an exception.
                 self._sleep("Exception while preparing queue: %s." % e)

trunk/WebKitTools/Scripts/run-webkit-unittests

@@ -36 +36 @@
 from modules.commands.upload_unittest import *
 from modules.commands.queries_unittest import *
+from modules.commands.queues_unittest import *
 from modules.committers_unittest import *
 from modules.cpp_style_unittest import *