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

Unified Diff: build/android/pylib/device/decorators.py

Issue 1290773009: [Android] Remove android_commands and android_testrunner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: msg3: sullivan comment 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/pylib/device/battery_utils_test.py ('k') | build/android/pylib/device/decorators_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/device/decorators.py
diff --git a/build/android/pylib/device/decorators.py b/build/android/pylib/device/decorators.py
index 73c13da8b09b9c0c2ffe6053f6fac529801ed997..ca29eb397fcd244ccad3a8aeb87df049def9083b 100644
--- a/build/android/pylib/device/decorators.py
+++ b/build/android/pylib/device/decorators.py
@@ -17,12 +17,6 @@ from pylib.device import device_errors
from pylib.utils import reraiser_thread
from pylib.utils import timeout_retry
-# TODO(jbudorick) Remove once the DeviceUtils implementations are no longer
-# backed by AndroidCommands / android_testrunner.
-sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT, 'third_party',
- 'android_testrunner'))
-import errors as old_errors
-
DEFAULT_TIMEOUT_ATTR = '_default_timeout'
DEFAULT_RETRIES_ATTR = '_default_retries'
@@ -55,12 +49,6 @@ def _TimeoutRetryWrapper(f, timeout_func, retries_func, pass_values=False):
return impl()
else:
return timeout_retry.Run(impl, timeout, retries)
- except old_errors.WaitForResponseTimedOutError as e:
- raise device_errors.CommandTimeoutError(str(e)), None, (
- sys.exc_info()[2])
- except old_errors.DeviceUnresponsiveError as e:
- raise device_errors.DeviceUnreachableError(str(e)), None, (
- sys.exc_info()[2])
except reraiser_thread.TimeoutError as e:
raise device_errors.CommandTimeoutError(str(e)), None, (
sys.exc_info()[2])
« no previous file with comments | « build/android/pylib/device/battery_utils_test.py ('k') | build/android/pylib/device/decorators_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698