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

Unified Diff: build/android/provision_devices.py

Issue 1290173003: [Android] Reland of Remove android_commands and android_testrunner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed: removed references from content/telemetry.isolate and TELEMETRY_DEPS Created 5 years, 4 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 | « build/android/gyp/util/build_device.py ('k') | build/android/pylib/android_commands.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/provision_devices.py
diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py
index 427d1fa91d5330c04bed68c1a79712a68dbf0e07..cde01ad0cf0167c72125f96f3fcb4c658c63ab5e 100755
--- a/build/android/provision_devices.py
+++ b/build/android/provision_devices.py
@@ -29,11 +29,6 @@ from pylib.device import device_utils
from pylib.utils import run_tests_helper
from pylib.utils import timeout_retry
-sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT,
- 'third_party', 'android_testrunner'))
-import errors
-
-
_SYSTEM_WEBVIEW_PATHS = ['/system/app/webview', '/system/app/WebViewGoogle']
@@ -106,8 +101,7 @@ def ProvisionDevice(device, options):
if should_run_phase(_PHASES.FINISH):
run_phase(FinishProvisioning, reboot=False)
- except (errors.WaitForResponseTimedOutError,
- device_errors.CommandTimeoutError):
+ except device_errors.CommandTimeoutError:
logging.exception('Timed out waiting for device %s. Adding to blacklist.',
str(device))
device_blacklist.ExtendBlacklist([str(device)])
« no previous file with comments | « build/android/gyp/util/build_device.py ('k') | build/android/pylib/android_commands.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698