Changeset 82978 in webkit

Timestamp:

Apr 5, 2011 2:04:16 PM (13 years ago)

Author:

morrita@google.com

Message:

2011-04-05 MORITA Hajime <​morrita@google.com>

Reviewed by Adam Barth.

webkit-patch should print git's stderr when git svn dcommit fail
​http://webkit.org/b/57861

• Scripts/webkitpy/common/checkout/scm.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive.py (modified) (1 diff)
• Scripts/webkitpy/common/system/executive_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-05  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Adam Barth.
+
+        webkit-patch should print git's stderr when git svn dcommit fail
+        http://webkit.org/b/57861
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+
 2011-04-05  Mihai Parparita  <mihaip@chromium.org>
 

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

@@ -82 +82 @@
         self.cwd = cwd
 
+    def __str__(self):
+        if self.output:
+            return self.message + "\n" + self.output
+        return self.message
+
     def message_with_output(self, output_limit=500):
         if self.output:

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

@@ -200 +200 @@
         # Maximum pid number on Linux is 32768 by default
         self.assertFalse(executive.check_running_pid(100000))
+
+
+class ScriptErrorTest(unittest.TestCase):
+
+    def test_str_with_message(self):
+        try:
+            raise ScriptError(message="message")
+        except ScriptError, e:
+            self.assertEqual(str(e), "message")
+
+    def test_str_without_message(self):
+        try:
+            raise ScriptError(script_args=["echo", "hello"], exit_code=1, cwd="./", output="Out")
+        except ScriptError, e:
+            self.assertEqual(str(e), "Failed to run \"['echo', 'hello']\" exit_code: 1 cwd: ./\nOut""")