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

Unified Diff: build/android/pylib/perf/test_runner.py

Issue 1841863002: Update monet. (Closed) Base URL: https://github.com/domokit/monet.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « build/android/pylib/perf/test_options.py ('k') | build/android/pylib/remote/device/dummy/dummy.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/perf/test_runner.py
diff --git a/build/android/pylib/perf/test_runner.py b/build/android/pylib/perf/test_runner.py
index 991fc003049152246d89d15f290b88c8c1b228c9..31eb0e9e9a4e4efa11cdcfe715d406c5a266fdb7 100644
--- a/build/android/pylib/perf/test_runner.py
+++ b/build/android/pylib/perf/test_runner.py
@@ -233,8 +233,15 @@ class TestRunner(base_test_runner.BaseTestRunner):
return ''
json_output_path = os.path.join(self._output_dir, 'results-chart.json')
- with open(json_output_path) as f:
- return f.read()
+ try:
+ with open(json_output_path) as f:
+ return f.read()
+ except IOError:
+ logging.exception('Exception when reading chartjson.')
+ logging.error('This usually means that telemetry did not run, so it could'
+ ' not generate the file. Please check the device running'
+ ' the test.')
+ return ''
def _LaunchPerfTest(self, test_name):
"""Runs a perf test.
@@ -266,6 +273,10 @@ class TestRunner(base_test_runner.BaseTestRunner):
logging.info(
'temperature: %s (0.1 C)',
str(self._device_battery.GetBatteryInfo().get('temperature')))
+ if self._options.max_battery_temp:
+ self._device_battery.LetBatteryCoolToTemperature(
+ self._options.max_battery_temp)
+
logging.info('%s : %s', test_name, cmd)
start_time = datetime.datetime.now()
« no previous file with comments | « build/android/pylib/perf/test_options.py ('k') | build/android/pylib/remote/device/dummy/dummy.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698