tools/telemetry/telemetry/page/html_page_measurement_results.py - Issue 26179009: [telemetry] Restore --reset-html-results option and rename to --reset-results

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: tools/telemetry/telemetry/page/html_page_measurement_results.py

Issue 26179009: [telemetry] Restore --reset-html-results option and rename to --reset-results (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix PageRunnerTests. Created 7 years, 2 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

« tools/telemetry/support/html_output/results-template.html ('K') | « tools/telemetry/support/html_output/results-template.html ('k') | tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 fb0f58dfbe0fe7059143ea65764e9946da0afd20..33063a60acbb47e07dd18808ded54b98884c08f7 100644

--- a/tools/telemetry/telemetry/page/html_page_measurement_results.py

+++ b/tools/telemetry/telemetry/page/html_page_measurement_results.py

@@ -27,11 +27,13 @@ _UNIT_JSON = ('tools', 'perf', 'unit-info.json')

class HtmlPageMeasurementResults(

buildbot_page_measurement_results.BuildbotPageMeasurementResults):

- def __init__(self, output_stream, test_name, browser_type, trace_tag=''):

+ def __init__(self, output_stream, test_name, reset_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._result_json = {

'buildTime': self._GetBuildTime(),

'revision': self._GetRevision(),

@@ -61,7 +63,7 @@ class HtmlPageMeasurementResults(

def _GetResultsJson(self):

results_html = self._output_stream.read()

- if not results_html:

+ if self._reset_results or not results_html:

return []

m = re.search(

'^<script id="results-json" type="application/json">(.*?)</script>$',