tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py - Issue 358993003: [Android] Switch to DeviceUtils versions of file functions.

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/profiler/android_profiling_helper_unittest.py

Issue 358993003: [Android] Switch to DeviceUtils versions of file functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py

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

index 1b839fd1ed22bc511df3879dac324ce65bac1676..6b1d227ecf7f176bf52265ecbd513471d1000dbc 100644

--- a/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py

+++ b/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py

@@ -19,7 +19,7 @@ def _GetLibrariesMappedIntoProcesses(device, pids):

libs = set()

for pid in pids:

maps_file = '/proc/%d/maps' % pid

- maps = device.old_interface.GetProtectedFileContents(maps_file)

+ maps = device.ReadFile(maps_file, as_root=True)

for map_line in maps:

lib = re.match(r'.*\s(/.*[.]so)$', map_line)

if lib:

@@ -126,8 +126,7 @@ class TestAndroidProfilingHelper(tab_test_case.TabTestCase):

@benchmark.Enabled('android')

def testGetToolchainBinaryPath(self):

with tempfile.NamedTemporaryFile() as libc:

- self._device.old_interface.PullFileFromDevice('/system/lib/libc.so',

- libc.name)

+ self._device.PullFile('/system/lib/libc.so', libc.name)

path = android_profiling_helper.GetToolchainBinaryPath(libc.name,

'objdump')

assert os.path.exists(path)