Changeset 53896 in webkit

Timestamp:

Jan 26, 2010 9:26:07 PM (14 years ago)

Author:

dbates@webkit.org

Message:

2010-01-26 Daniel Bates <​dbates@webkit.org>

Reviewed by Adam Barth.

​https://bugs.webkit.org/show_bug.cgi?id=34070

Moves the try/catch for OSError exceptions in Executive.run_command
to Credentials.read_credentials() so that the unit test
webkitpy.scm_unittest.SCMClassTests.test_error_handlers can
assert that Executive.run_command throws an OSError exception.

• Scripts/webkitpy/credentials.py:
• Scripts/webkitpy/executive.py: Moved try/catch for OSError to method Credentials.read_credentials().
• Scripts/webkitpy/executive_unittest.py: Removed tests that no longer apply: test_run_command_with_bad_command_check_return_code and test_run_command_with_bad_command_check_calls_error_handler. Added new test to assert that run_command throws OSError exceptions.

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-26  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34070
+
+        Moves the try/catch for OSError exceptions in Executive.run_command
+        to Credentials.read_credentials() so that the unit test
+        webkitpy.scm_unittest.SCMClassTests.test_error_handlers can
+        assert that Executive.run_command throws an OSError exception.
+
+        * Scripts/webkitpy/credentials.py:
+        * Scripts/webkitpy/executive.py: Moved try/catch for OSError to
+        method Credentials.read_credentials().
+        * Scripts/webkitpy/executive_unittest.py: Removed tests that no longer
+        apply: test_run_command_with_bad_command_check_return_code and
+        test_run_command_with_bad_command_check_calls_error_handler. Added new
+        test to assert that run_command throws OSError exceptions.
+
 2010-01-26  Diego Gonzalez  <diego.gonzalez@openbossa.org>
 

trunk/WebKitTools/Scripts/webkitpy/credentials.py

@@ -112 +112 @@
         password = None
 
-        if Git.in_working_directory(self.cwd):
-            (username, password) = self._credentials_from_git()
+        try:
+            if Git.in_working_directory(self.cwd):
+                (username, password) = self._credentials_from_git()
+        except OSError, e:
+            # Catch and ignore OSError exceptions such as "no such file 
+            # or directory" (OSError errno 2), which imply that the Git
+            # command cannot be found/is not installed.
+            pass
 
         if not username or not password:

trunk/WebKitTools/Scripts/webkitpy/executive.py

@@ -153 +153 @@
         else:
             stderr = None
-        try:
-            process = subprocess.Popen(args,
-                                       stdin=stdin,
-                                       stdout=subprocess.PIPE,
-                                       stderr=stderr,
-                                       cwd=cwd)
-            output = process.communicate(string_to_communicate)[0]
-            exit_code = process.wait()
-        except OSError, e:
-            # Catch OSError exceptions. For example, "no such file or
-            # directory" (i.e. OSError errno 2), when the command cannot be
-            # found.
-            output = e.strerror
-            exit_code = e.errno
+
+        process = subprocess.Popen(args,
+                                   stdin=stdin,
+                                   stdout=subprocess.PIPE,
+                                   stderr=stderr,
+                                   cwd=cwd)
+        output = process.communicate(string_to_communicate)[0]
+        exit_code = process.wait()
         if exit_code:
             script_error = ScriptError(script_args=args,

trunk/WebKitTools/Scripts/webkitpy/executive_unittest.py

@@ -29 +29 @@
 
 import unittest
-from webkitpy.executive import Executive, ScriptError, run_command
+from webkitpy.executive import Executive, run_command
 
 class ExecutiveTest(unittest.TestCase):
 
-    def test_run_command_with_bad_command_check_return_code(self):
-        self.assertEqual(run_command(["foo_bar_command_blah"], error_handler=Executive.ignore_error, return_exit_code=True), 2)
-
-    def test_run_command_with_bad_command_check_calls_error_handler(self):
-        self.didHandleErrorGetCalled = False
-        def handleError(scriptError):
-            self.didHandleErrorGetCalled = True
-            self.assertEqual(scriptError.exit_code, 2)
-
-        run_command(["foo_bar_command_blah"], error_handler=handleError)
-        self.assertTrue(self.didHandleErrorGetCalled)
+    def test_run_command_with_bad_command(self):
+        def run_bad_command():
+            run_command(["foo_bar_command_blah"], error_handler=Executive.ignore_error, return_exit_code=True)
+        self.failUnlessRaises(OSError, run_bad_command)
 
 if __name__ == '__main__':