Changeset 76134 in webkit

Timestamp:

Jan 19, 2011 10:14:29 AM (13 years ago)

Author:

tony@chromium.org

Message:

2011-01-19 Tony Chang <​tony@chromium.org>

Reviewed by Mihai Parparita.

[chromium] [linux] if check-sys-deps fails, output the failure reason
​https://bugs.webkit.org/show_bug.cgi?id=52671

• Scripts/webkitpy/common/system/executive_mock.py: Add support for

error handler functions.

• Scripts/webkitpy/layout_tests/port/chromium.py:

output the error text from --check-sys-deps

• Scripts/webkitpy/layout_tests/port/chromium_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive_mock.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium_unittest.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-19  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        [chromium] [linux] if check-sys-deps fails, output the failure reason
+        https://bugs.webkit.org/show_bug.cgi?id=52671
+
+        * Scripts/webkitpy/common/system/executive_mock.py: Add support for
+            error handler functions.
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+            output the error text from --check-sys-deps
+        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+
 2011-01-19  Aparna Nandyal  <aparna.nand@wipro.com>
 

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

@@ -31 +31 @@
 # FIXME: Unify with tool/mocktool.MockExecutive.
 
+from webkitpy.common.system import executive
+
 
 class MockExecutive2(object):
@@ -49 +51 @@
         pass
 
-    def run_command(self, arg_list, return_exit_code=False,
+    def run_command(self, arg_list, error_handler=None, return_exit_code=False,
                     decode_output=False):
         if self._exception:
@@ -57 +59 @@
         if self._run_command_fn:
             return self._run_command_fn(arg_list)
+        if self._exit_code and error_handler:
+            script_error = executive.ScriptError(script_args=arg_list,
+                                                 exit_code=self._exit_code,
+                                                 output=self._output)
+            error_handler(script_error)
+
         return self._output

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -45 +45 @@
 import webbrowser
 
+from webkitpy.common.system import executive
 from webkitpy.common.system.path import cygpath
 from webkitpy.layout_tests.layout_package import test_expectations
@@ -121 +122 @@
     def check_sys_deps(self, needs_http):
         cmd = [self._path_to_driver(), '--check-layout-test-sys-deps']
-        if self._executive.run_command(cmd, return_exit_code=True):
+
+        local_error = executive.ScriptError()
+
+        def error_handler(script_error):
+            local_error.exit_code = script_error.exit_code
+
+        output = self._executive.run_command(cmd, error_handler=error_handler)
+        if local_error.exit_code:
             _log.error('System dependencies check failed.')
             _log.error('To override, invoke with --nocheck-sys-deps')
             _log.error('')
+            _log.error(output)
             return False
         return True

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py

@@ -31 +31 @@
 import StringIO
 
+from webkitpy.common.system import logtesting
+from webkitpy.common.system import executive_mock
 from webkitpy.tool import mocktool
 from webkitpy.thirdparty.mock import Mock
@@ -154 +156 @@
                 return "/path/to/image_diff"
 
-        class MockExecute:
-            def __init__(self, result):
-                self._result = result
-
-            def run_command(self,
-                            args,
-                            cwd=None,
-                            input=None,
-                            error_handler=None,
-                            return_exit_code=False,
-                            return_stderr=True,
-                            decode_output=False):
-                if return_exit_code:
-                    return self._result
-                return ''
-
         mock_options = mocktool.MockOptions()
         port = ChromiumPortTest.TestLinuxPort(mock_options)
 
         # Images are different.
-        port._executive = MockExecute(0)
+        port._executive = executive_mock.MockExecutive2(exit_code=0)
         self.assertEquals(False, port.diff_image("EXPECTED", "ACTUAL"))
 
         # Images are the same.
-        port._executive = MockExecute(1)
+        port._executive = executive_mock.MockExecutive2(exit_code=1)
         self.assertEquals(True, port.diff_image("EXPECTED", "ACTUAL"))
 
         # There was some error running image_diff.
-        port._executive = MockExecute(2)
+        port._executive = executive_mock.MockExecutive2(exit_code=2)
         exception_raised = False
         try:
@@ -190 +176 @@
         self.assertFalse(exception_raised)
 
+
+class ChromiumPortLoggingTest(logtesting.LoggingTestCase):
+    def test_check_sys_deps(self):
+        mock_options = mocktool.MockOptions()
+        port = ChromiumPortTest.TestLinuxPort(options=mock_options)
+
+        # Success
+        port._executive = executive_mock.MockExecutive2(exit_code=0)
+        self.assertTrue(port.check_sys_deps(needs_http=False))
+
+        # Failure
+        port._executive = executive_mock.MockExecutive2(exit_code=1,
+            output='testing output failure')
+        self.assertFalse(port.check_sys_deps(needs_http=False))
+        self.assertLog([
+            'ERROR: System dependencies check failed.\n',
+            'ERROR: To override, invoke with --nocheck-sys-deps\n',
+            'ERROR: \n',
+            'ERROR: testing output failure\n'])
+
 if __name__ == '__main__':
     unittest.main()