Changeset 136192 in webkit

Timestamp:

Nov 29, 2012, 6:11:44 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

Fix python unit tests after r136158 (android port tests failing)
​https://bugs.webkit.org/show_bug.cgi?id=103581

Unreviewed, build fix.

The unit tests apparently weren't ran for this patch; we failed
to update the mock executive calls out to adb to determine various
aspects of the environment, and were failing to create drivers.

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

(MockRunCommand.mock_run_command_fn):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-11-29  Dirk Pranke  <dpranke@chromium.org>
+
+        Fix python unit tests after r136158 (android port tests failing)
+        https://bugs.webkit.org/show_bug.cgi?id=103581
+
+        Unreviewed, build fix.
+
+        The unit tests apparently weren't ran for this patch; we failed
+        to update the mock executive calls out to adb to determine various
+        aspects of the environment, and were failing to create drivers.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py:
+        (MockRunCommand.mock_run_command_fn):
+
 2012-11-29  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -51 +51 @@
 
     def mock_run_command_fn(self, args):
-        if args[0] != 'adb':
+        if not args[0].endswith('adb'):
             return ''
         if args[1] == 'devices':
             return self._mock_devices_output
+        if args[1] == 'version':
+            return 'version 1.0'
 
         assert len(args) > 3