Changeset 85462 in webkit

Timestamp:

May 2, 2011 12:17:32 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-05-02 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

workspace.py fails to import ScriptError
​https://bugs.webkit.org/show_bug.cgi?id=59915

If the workspace fails to create a zip, webkitpy crashes instead of
handling the error as expected.

• Scripts/webkitpy/common/system/workspace.py:
• Scripts/webkitpy/common/system/workspace_unittest.py:
• Scripts/webkitpy/tool/mocktool.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/workspace.py (modified) (1 diff)
• Scripts/webkitpy/common/system/workspace_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/mocktool.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-02  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        workspace.py fails to import ScriptError
+        https://bugs.webkit.org/show_bug.cgi?id=59915
+
+        If the workspace fails to create a zip, webkitpy crashes instead of
+        handling the error as expected.
+
+        * Scripts/webkitpy/common/system/workspace.py:
+        * Scripts/webkitpy/common/system/workspace_unittest.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+
 2011-05-01  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/system/workspace.py

@@ -32 +32 @@
 import logging
 import zipfile
+
+from webkitpy.common.system.executive import ScriptError
 
 

trunk/Tools/Scripts/webkitpy/common/system/workspace_unittest.py

@@ -57 +57 @@
         archive = OutputCapture().assert_outputs(self, workspace.create_zip, ["/zip/path", "/source/path", MockZipFile], expected_stderr=expected_stderr)
         self.assertEqual(archive.filename, "/zip/path")
+
+    def test_create_zip_exception(self):
+        workspace = Workspace(None, MockExecutive(should_log=True, should_throw=True))
+        expected_stderr = "MOCK run_command: ['zip', '-r', '/zip/path', '/source/path']\n"
+        class MockZipFile(object):
+            def __init__(self, path):
+                self.filename = path
+        archive = OutputCapture().assert_outputs(self, workspace.create_zip, ["/zip/path", "/source/path", MockZipFile], expected_stderr=expected_stderr)
+        self.assertEqual(archive, None)

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

@@ -35 +35 @@
 from webkitpy.common.net.bugzilla import Bug, Attachment
 from webkitpy.common.system.deprecated_logging import log
+from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.thirdparty.mock import Mock
@@ -663 +664 @@
 # FIXME: Unify with common.system.executive_mock.MockExecutive.
 class MockExecutive(Mock):
-    def __init__(self, should_log):
-        self.should_log = should_log
+    def __init__(self, should_log, should_throw=False):
+        self._should_log = should_log
+        self._should_throw = should_throw
 
     def run_and_throw_if_fail(self, args, quiet=False):
-        if self.should_log:
+        if self._should_log:
             log("MOCK run_and_throw_if_fail: %s" % args)
         return "MOCK output of child process"
@@ -679 +681 @@
                     return_stderr=True,
                     decode_output=False):
-        if self.should_log:
+        if self._should_log:
             log("MOCK run_command: %s" % args)
+        if self._should_throw:
+            raise ScriptError("MOCK ScriptError")
         return "MOCK output of child process"