Changeset 83015 in webkit

Timestamp:

Apr 5, 2011 8:58:08 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-05 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r82978, r82999, and r83001.
​http://trac.webkit.org/changeset/82978
​http://trac.webkit.org/changeset/82999
​http://trac.webkit.org/changeset/83001
​https://bugs.webkit.org/show_bug.cgi?id=57913

Does not work in Python 2.5 (Requested by abarth on #webkit).

• Scripts/webkitpy/common/system/executive.py:
• Scripts/webkitpy/common/system/executive_unittest.py:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r82978, r82999, and r83001.
+        http://trac.webkit.org/changeset/82978
+        http://trac.webkit.org/changeset/82999
+        http://trac.webkit.org/changeset/83001
+        https://bugs.webkit.org/show_bug.cgi?id=57913
+
+        Does not work in Python 2.5 (Requested by abarth on #webkit).
+
+        * Scripts/webkitpy/common/system/executive.py:
+        * Scripts/webkitpy/common/system/executive_unittest.py:
+
 2011-04-05  Chang Shu  <cshu@webkit.org>
 

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

@@ -28 +28 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import with_statement
-
 try:
     # This API exists only in Python 2.6 and higher.  :(
@@ -46 +44 @@
 import sys
 import time
-import warnings
 
 from webkitpy.common.system.deprecated_logging import tee
@@ -84 +81 @@
         self.output = output
         self.cwd = cwd
-
-    def __str__(self):
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore")
-            if self.output:
-                return self.message + "\n" + self.output
-            return self.message
 
     def message_with_output(self, output_limit=500):

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""")