Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2461)

Unified Diff: Tools/Scripts/webkitpy/layout_tests/port/android.py

Issue 401243005: Fix webkit_tests on Android (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/webkitpy/layout_tests/port/android.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/android.py b/Tools/Scripts/webkitpy/layout_tests/port/android.py
index 8fad833e5b63cf9fa723e37196c52f4d8d85ad9b..3782efab95beef468d0b4b0042bc81ff95c2e2b1 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/android.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/android.py
@@ -1071,7 +1071,7 @@ class ChromiumAndroidDriver(driver.Driver):
not self._android_commands.file_exists(self._out_fifo_path) and
not self._android_commands.file_exists(self._err_fifo_path))
- def start(self, pixel_tests, per_test_args):
+ def start(self, pixel_tests, per_test_args, deadline):
# We override the default start() so that we can call _android_driver_cmd_line()
# instead of cmd_line().
new_cmd_line = self._android_driver_cmd_line(pixel_tests, per_test_args)
@@ -1084,7 +1084,7 @@ class ChromiumAndroidDriver(driver.Driver):
self.stop()
self._current_android_cmd_line = new_cmd_line
- super(ChromiumAndroidDriver, self).start(pixel_tests, per_test_args)
+ super(ChromiumAndroidDriver, self).start(pixel_tests, per_test_args, deadline)
def _start(self, pixel_tests, per_test_args):
if not self._android_devices.is_device_prepared(self._android_commands.get_serial()):
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698