tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py - Issue 243403003: [Android] Change object types from AndroidCommands to DeviceUtils everywhere else.

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/core/platform/android_platform_backend_unittest.py

Issue 243403003: [Android] Change object types from AndroidCommands to DeviceUtils everywhere else. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 8 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/core/platform/android_platform_backend.py ('k') | tools/telemetry/telemetry/core/platform/power_monitor/android_ds2784_power_monitor.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py

diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py b/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py

index be8d156488b84831f87e86da17ee929cf4760017..8217d00d23f0345e641d1b416fcebf645fc153bb 100644

--- a/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py

+++ b/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py

@@ -34,6 +34,11 @@ class MockAdbCommands(object):

return []

+class MockDevice(object):

+ def __init__(self, mock_adb_commands):

+ self.old_interface = mock_adb_commands

class AndroidPlatformBackendTest(unittest.TestCase):

def setUp(self):

self._stubs = system_stub.Override(android_platform_backend,

@@ -50,7 +55,7 @@ class AndroidPlatformBackendTest(unittest.TestCase):

'4294967295 1074458624 1074463824 3197495984 3197494152 '

'1074767676 0 4612 0 38136 4294967295 0 0 17 0 0 0 0 0 0 '

'1074470376 1074470912 1102155776']

- adb_valid_proc_content = MockAdbCommands(proc_stat_content, {})

+ adb_valid_proc_content = MockDevice(MockAdbCommands(proc_stat_content, {}))

backend = android_platform_backend.AndroidPlatformBackend(

adb_valid_proc_content, False)

cpu_stats = backend.GetCpuStats('7702')

@@ -59,7 +64,7 @@ class AndroidPlatformBackendTest(unittest.TestCase):

@test.Disabled('chromeos')

def testGetCpuStatsInvalidPID(self):

# Mock an empty /proc/pid/stat.

- adb_empty_proc_stat = MockAdbCommands([], {})

+ adb_empty_proc_stat = MockDevice(MockAdbCommands([], {}))

backend = android_platform_backend.AndroidPlatformBackend(

adb_empty_proc_stat, False)

cpu_stats = backend.GetCpuStats('7702')

@@ -67,7 +72,7 @@ class AndroidPlatformBackendTest(unittest.TestCase):

@test.Disabled

def testFramesFromMp4(self):

- mock_adb = MockAdbCommands([])

+ mock_adb = MockDevice(MockAdbCommands([]))

backend = android_platform_backend.AndroidPlatformBackend(mock_adb, False)

try: