| Index: tools/telemetry/telemetry/page/html_page_measurement_results.py
|
| diff --git a/tools/telemetry/telemetry/page/html_page_measurement_results.py b/tools/telemetry/telemetry/page/html_page_measurement_results.py
|
| index 33063a60acbb47e07dd18808ded54b98884c08f7..8776ef6ff1d54e8ed580e5e40d9d9359d23b1159 100644
|
| --- a/tools/telemetry/telemetry/page/html_page_measurement_results.py
|
| +++ b/tools/telemetry/telemetry/page/html_page_measurement_results.py
|
| @@ -10,6 +10,7 @@ import re
|
|
|
| from telemetry.core import util
|
| from telemetry.page import buildbot_page_measurement_results
|
| +from telemetry.page import cloud_storage
|
|
|
| util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'util')
|
| import lastchange # pylint: disable=F0401
|
| @@ -27,13 +28,14 @@ _UNIT_JSON = ('tools', 'perf', 'unit-info.json')
|
|
|
| class HtmlPageMeasurementResults(
|
| buildbot_page_measurement_results.BuildbotPageMeasurementResults):
|
| - def __init__(self, output_stream, test_name, reset_results, browser_type,
|
| - trace_tag=''):
|
| + def __init__(self, output_stream, test_name, reset_results, upload_results,
|
| + browser_type, trace_tag=''):
|
| super(HtmlPageMeasurementResults, self).__init__(trace_tag)
|
|
|
| self._output_stream = output_stream
|
| self._test_name = test_name
|
| self._reset_results = reset_results
|
| + self._upload_results = upload_results
|
| self._result_json = {
|
| 'buildTime': self._GetBuildTime(),
|
| 'revision': self._GetRevision(),
|
| @@ -105,5 +107,13 @@ class HtmlPageMeasurementResults(
|
| html = html.replace('%plugins%', self._GetPlugins())
|
| self._SaveResults(html)
|
|
|
| + if self._upload_results:
|
| + file_path = os.path.abspath(self._output_stream.name)
|
| + file_name = 'html-results/results-%s' % datetime.datetime.now().strftime(
|
| + '%Y-%m-%d_%H-%M-%S')
|
| + cloud_storage.Insert(cloud_storage.PUBLIC_BUCKET, file_name, file_path)
|
| + print
|
| + print ('View online at '
|
| + 'http://storage.googleapis.com/chromium-telemetry/%s' % file_name)
|
| print
|
| print 'View result at file://%s' % os.path.abspath(self._output_stream.name)
|
|
|