2011-04-05 Sheriff Bot <webkit.review.bot@gmail.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Apr 2011 03:58:08 +0000 (03:58 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Apr 2011 03:58:08 +0000 (03:58 +0000)
        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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/common/system/executive.py
Tools/Scripts/webkitpy/common/system/executive_unittest.py

index 5906223..bd4a172 100644 (file)
@@ -1,3 +1,16 @@
+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>
 
         Reviewed by Darin Adler.
index 8f75ba7..7d198dd 100644 (file)
@@ -27,8 +27,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # 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.  :(
     import multiprocessing
@@ -45,7 +43,6 @@ import signal
 import subprocess
 import sys
 import time
-import warnings
 
 from webkitpy.common.system.deprecated_logging import tee
 from webkitpy.common.system.filesystem import FileSystem
@@ -84,13 +81,6 @@ class ScriptError(Exception):
         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):
         if self.output:
             if output_limit and len(self.output) > output_limit:
index bda67ee..9a14d6b 100644 (file)
@@ -199,18 +199,3 @@ class ExecutiveTest(unittest.TestCase):
         self.assertTrue(executive.check_running_pid(os.getpid()))
         # 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""")