Title: [136192] trunk/Tools
- Revision
- 136192
- Author
- [email protected]
- Date
- 2012-11-29 18:11:44 -0800 (Thu, 29 Nov 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (136191 => 136192)
--- trunk/Tools/ChangeLog 2012-11-30 01:42:34 UTC (rev 136191)
+++ trunk/Tools/ChangeLog 2012-11-30 02:11:44 UTC (rev 136192)
@@ -1,3 +1,17 @@
+2012-11-29 Dirk Pranke <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r136175 and r136177.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py (136191 => 136192)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py 2012-11-30 01:42:34 UTC (rev 136191)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py 2012-11-30 02:11:44 UTC (rev 136192)
@@ -50,10 +50,12 @@
self._mock_ls_tombstones = ''
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
assert args[1] == '-s'
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
