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

Unified Diff: build/android/pylib/base/test_dispatcher_unittest.py

Issue 1770943003: [Android] Remove chromium version of devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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/devil/utils/zip_utils.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/base/test_dispatcher_unittest.py
diff --git a/build/android/pylib/base/test_dispatcher_unittest.py b/build/android/pylib/base/test_dispatcher_unittest.py
index 9b8633e683af644bcce483b9a784c3c8992e7e41..186a0721d25022cae7596ec3d0eeb2e3861df6a3 100755
--- a/build/android/pylib/base/test_dispatcher_unittest.py
+++ b/build/android/pylib/base/test_dispatcher_unittest.py
@@ -10,15 +10,17 @@
import unittest
-from devil.android import device_utils
-from devil.android.sdk import adb_wrapper
-from devil.constants import exit_codes
-from devil.utils import watchdog_timer
from pylib.base import base_test_result
from pylib.base import test_collection
from pylib.base import test_dispatcher
from pylib.constants import host_paths
+with host_paths.SysPath(host_paths.DEVIL_PATH):
+ from devil.android import device_utils
+ from devil.android.sdk import adb_wrapper
+ from devil.constants import exit_codes
+ from devil.utils import watchdog_timer
+
with host_paths.SysPath(host_paths.PYMOCK_PATH):
import mock # pylint: disable=import-error
« no previous file with comments | « build/android/devil/utils/zip_utils.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698