Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1429)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/android/pylib/instrumentation/test_runner.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
« no previous file with comments | « build/android/pylib/flag_changer.py ('k') | build/android/pylib/perf/thermal_throttle.py » ('j') | tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 92d80f97f145362d66272433be5a3ccbfd0b0932..f84aa2e3e798121450483fe8aa164878f60ec1de 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -235,10 +235,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') | tools/telemetry/telemetry/core/platform/power_monitor/android_temperature_monitor.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698