build/android/pylib/instrumentation/test_runner.py - Issue 404993004: [Android] Switch to DeviceUtils versions of GetMemoryUsageForPid and __str__.

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: build/android/pylib/instrumentation/test_runner.py

Issue 404993004: [Android] Switch to DeviceUtils versions of GetMemoryUsageForPid and __str__. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comment from frankf Created 6 years, 5 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

Index: build/android/pylib/instrumentation/test_runner.py

diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py

index 923a3fd3567ca08e31cdd188df4a6f8c3d35d0dd..d9ccb2676e9a3856ff2133b438194800f0ec43b0 100644

--- a/build/android/pylib/instrumentation/test_runner.py

+++ b/build/android/pylib/instrumentation/test_runner.py

@@ -98,7 +98,7 @@ class TestRunner(base_test_runner.BaseTestRunner):

# once across test runners.

if TestRunner._DEVICE_HAS_TEST_FILES.get(self.device, False):

logging.warning('Already copied test files to device %s, skipping.',

- self.device.old_interface.GetDevice())

+ str(self.device))

return

test_data = _GetDataFilesForTestSuite(self.test_pkg.GetApkName())

@@ -125,8 +125,7 @@ class TestRunner(base_test_runner.BaseTestRunner):

TestRunner._DEVICE_DATA_DIR,

dst_layer))

self.tool.CopyFiles()

- TestRunner._DEVICE_HAS_TEST_FILES[

- self.device.old_interface.GetDevice()] = True

+ TestRunner._DEVICE_HAS_TEST_FILES[str(self.device)] = True

def _GetInstrumentationArgs(self):

ret = {}

« no previous file with comments | « build/android/pylib/host_driven/test_runner.py ('k') | build/android/pylib/perf/thermal_throttle.py » ('j') | no next file with comments »