tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py - Issue 775333002: Migrate DeviceUtils.ReadFile to adb_wrapper

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 775333002: Migrate DeviceUtils.ReadFile to adb_wrapper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix breakages in telemetry unittests Created 6 years 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

« tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor.py ('K') | « tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor_unittest.py ('k') | no next file » | 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 4ce807471ca4f82d8870393a1482edf1534bd6e3..5c62d99d60e895c7cc248cf1529ddbc206ac3466 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

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

libs = set()

for pid in pids:

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

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

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

for map_line in maps:

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

if lib: