Changeset 51283 in webkit

Timestamp:

Nov 21, 2009 7:50:16 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-21 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

commit-queue fails to run with "permissions error" due to bad bugzilla-tool path
​https://bugs.webkit.org/show_bug.cgi?id=31767

What we really want to test is BugzillaTool.path() instead of TrivialTool.path().
Since we don't have a good way to test BugzillaTool pieces, I've
left out a test for now.

• Scripts/bugzilla-tool:
  • Add a path() implementation to expose bugzilla-tool's file path to commit-queue.
• Scripts/modules/commands/queues.py:
  • Use tool.path() instead of file.
• Scripts/modules/multicommandtool.py:
  • Add a new path() method to MultiComandTool.
• Scripts/modules/multicommandtool_unittest.py:
  • Provide a path() method. Little point in testing this mock implementation.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (1 diff)
• Scripts/modules/commands/queues.py (modified) (1 diff)
• Scripts/modules/multicommandtool.py (modified) (2 diffs)
• Scripts/modules/multicommandtool_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-21  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        commit-queue fails to run with "permissions error" due to bad bugzilla-tool path
+        https://bugs.webkit.org/show_bug.cgi?id=31767
+
+        What we really want to test is BugzillaTool.path() instead of TrivialTool.path().
+        Since we don't have a good way to test BugzillaTool pieces, I've
+        left out a test for now.
+
+        * Scripts/bugzilla-tool:
+         - Add a path() implementation to expose bugzilla-tool's __file__ path to commit-queue.
+        * Scripts/modules/commands/queues.py:
+         - Use tool.path() instead of __file__.
+        * Scripts/modules/multicommandtool.py:
+         - Add a new path() method to MultiComandTool.
+        * Scripts/modules/multicommandtool_unittest.py:
+         - Provide a path() method.  Little point in testing this mock implementation.
+
 2009-11-21  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -73 +73 @@
         return self.cached_scm
 
+    def path(self):
+        return __file__
+
     def should_show_command_help(self, command):
         if command.requires_local_commits:

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

@@ -95 +95 @@
         raise NotImplementedError, "subclasses must implement"
 
-    @staticmethod
-    def run_bugzilla_tool(args):
-        bugzilla_tool_path = __file__ # re-execute this script
-        bugzilla_tool_args = [bugzilla_tool_path] + args
+    def run_bugzilla_tool(self, args):
+        bugzilla_tool_args = [tool.path()] + args
         WebKitLandingScripts.run_and_throw_if_fail(bugzilla_tool_args)
 

trunk/WebKitTools/Scripts/modules/multicommandtool.py

@@ -155 +155 @@
         return None
 
+    def path(self):
+        raise NotImplementedError, "subclasses must implement"
+
     def should_show_command_help(self, command):
         raise NotImplementedError, "subclasses must implement"
@@ -160 +163 @@
     def should_execute_command(self, command):
         raise NotImplementedError, "subclasses must implement"
-
 
     def main(self, argv=sys.argv):

trunk/WebKitTools/Scripts/modules/multicommandtool_unittest.py

@@ -56 +56 @@
         MultiCommandTool.__init__(self, commands)
 
+    def path():
+        return __file__
+
     def should_show_command_help(self, command):
         return True