tools/telemetry/telemetry/internal/platform/android_device_unittest.py - Issue 1314313004: [Android][telemetry] Update pylib imports for modules that moved into devil.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/internal/platform/android_device_unittest.py

Issue 1314313004: [Android][telemetry] Update pylib imports for modules that moved into devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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 | « tools/telemetry/telemetry/internal/platform/android_device.py ('k') | tools/telemetry/telemetry/internal/platform/android_platform_backend.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/internal/platform/android_device_unittest.py

diff --git a/tools/telemetry/telemetry/internal/platform/android_device_unittest.py b/tools/telemetry/telemetry/internal/platform/android_device_unittest.py

index 9788af9fdfdf3d265d4c2fd83e6461407d5c0fb1..f953b30b7e78ebb0a9b2de3733180f653e47007e 100644

--- a/tools/telemetry/telemetry/internal/platform/android_device_unittest.py

+++ b/tools/telemetry/telemetry/internal/platform/android_device_unittest.py

@@ -9,13 +9,13 @@ from telemetry.internal.platform import android_device

from telemetry.testing import system_stub

import mock

-from pylib.device import device_utils

+from devil.android import device_utils

class _BaseAndroidDeviceTest(unittest.TestCase):

def setUp(self):

self._healthy_device_patcher = mock.patch(

- 'pylib.device.device_utils.DeviceUtils.HealthyDevices')

+ 'devil.android.device_utils.DeviceUtils.HealthyDevices')

self._healthy_device_mock = self._healthy_device_patcher.start()

self._android_device_stub = system_stub.Override(

android_device, ['subprocess', 'logging'])