build/android/pylib/instrumentation/test_runner.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: build/android/pylib/instrumentation/test_runner.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. 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 ec0baeea1c3647d2ba81b568b1ab6209efec6639..424dcb3b1a564e511a528730c1c7716b41ceffe1 100644

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

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

@@ -237,10 +237,8 @@ class TestRunner(base_test_runner.BaseTestRunner):

'/data/data/com.google.android.apps.chrome/files/PerfTestData.txt',

as_root=True)

- if json_string:

- json_string = '\n'.join(json_string)

- else:

- raise Exception('Perf file does not exist or is empty')

+ if not json_string:

+ raise Exception('Perf file is empty')

if self.options.save_perf_json:

json_local_file = '/tmp/chromium-android-perf-json-' + raw_test_name

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