build/android/pylib/remote/device/remote_device_test_run.py - Issue 903273002: Update from https://crrev.com/315085

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/remote/device/remote_device_test_run.py

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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:

Index: build/android/pylib/remote/device/remote_device_test_run.py

diff --git a/build/android/pylib/remote/device/remote_device_test_run.py b/build/android/pylib/remote/device/remote_device_test_run.py

index 0b2deae4c47ccff3ad6e12ed54cef34bbc1dd173..91701b0879cdc660abec24e609e0ef7fce665a9b 100644

--- a/build/android/pylib/remote/device/remote_device_test_run.py

+++ b/build/android/pylib/remote/device/remote_device_test_run.py

@@ -49,7 +49,7 @@ class RemoteDeviceTestRun(test_run.TestRun):

if self._env.trigger:

self._TriggerSetUp()

elif self._env.collect:

- assert isinstance(self._env.trigger, basestring), (

+ assert isinstance(self._env.collect, basestring), (

'File for storing test_run_id must be a string.')

with open(self._env.collect, 'r') as persisted_data_file:

persisted_data = json.loads(persisted_data_file.read())