tools/telemetry/telemetry/core/forwarders/android_forwarder.py - Issue 806843002: Reland of Migrate DeviceUtils.ReadFile to adb_wrapper (try 3)

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/forwarders/android_forwarder.py

Issue 806843002: Reland of Migrate DeviceUtils.ReadFile to adb_wrapper (try 3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: enable command line test only for android Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py ('k') | tools/telemetry/telemetry/core/platform/android_platform_backend.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/forwarders/android_forwarder.py

diff --git a/tools/telemetry/telemetry/core/forwarders/android_forwarder.py b/tools/telemetry/telemetry/core/forwarders/android_forwarder.py

index c5ef45d29fab7763b7e58e8d803b28d315d90230..19f5132f3cf0b7659b5bb9fadb1a63b0920ebe15 100644

--- a/tools/telemetry/telemetry/core/forwarders/android_forwarder.py

+++ b/tools/telemetry/telemetry/core/forwarders/android_forwarder.py

@@ -231,7 +231,7 @@ class AndroidRndisConfigurator(object):

"""Returns the name of the host-side network interface."""

interface_list = self._EnumerateHostInterfaces()

ether_address = self._device.ReadFile(

- '%s/f_rndis/ethaddr' % self._RNDIS_DEVICE)[0]

+ '%s/f_rndis/ethaddr' % self._RNDIS_DEVICE).strip()

interface_name = None

for line in interface_list:

if not line.startswith((' ', '\t')):

@@ -322,7 +322,7 @@ doit &

self._device.RunShellCommand('rm %s.log' % script_prefix)

self._device.RunShellCommand('. %s.sh' % script_prefix)

self._WaitForDevice()

- result = self._device.ReadFile('%s.log' % script_prefix)

+ result = self._device.ReadFile('%s.log' % script_prefix).splitlines()

assert any('DONE' in line for line in result), 'RNDIS script did not run!'

def _CheckEnableRndis(self, force):