telemetry/telemetry/page/cache_temperature.py - Issue 2693923005: Reland of [Telemetry] Switch clients to new JavaScript API (batch 5)

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

Issue 2693923005: Reland of [Telemetry] Switch clients to new JavaScript API (batch 5) (Closed)

Patch Set: Created 3 years, 10 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 | « telemetry/telemetry/internal/platform/tracing_agent/chrome_tracing_agent.py ('k') | telemetry/telemetry/page/legacy_page_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: telemetry/telemetry/page/cache_temperature.py

diff --git a/telemetry/telemetry/page/cache_temperature.py b/telemetry/telemetry/page/cache_temperature.py

index 0c60457593937e710256b6c4057bcc4418a12804..d4782793958f8e0c1a3b19703c9f9b106f8ed9b4 100644

--- a/telemetry/telemetry/page/cache_temperature.py

+++ b/telemetry/telemetry/page/cache_temperature.py

@@ -31,28 +31,22 @@

self.identifier = identifier

def __enter__(self):

- # TODO(catapult:#3028): Fix interpolation of JavaScript values.

- self.browser.tabs[0].ExecuteJavaScript(

- """console.time('telemetry.internal.{0}.start');""".format(

- self.identifier))

- # TODO(catapult:#3028): Fix interpolation of JavaScript values.

- self.browser.tabs[0].ExecuteJavaScript(

- """console.timeEnd('telemetry.internal.{0}.start');""".format(

- self.identifier))

+ marker = 'telemetry.internal.%s.start' % self.identifier

+ self.browser.tabs[0].ExecuteJavaScript2(

+ "console.time({{ marker }});", marker=marker)

+ self.browser.tabs[0].ExecuteJavaScript2(

+ "console.timeEnd({{ marker }});", marker=marker)

return self

def __exit__(self, exception_type, exception_value, traceback):

if exception_type:

return True

- # TODO(catapult:#3028): Fix interpolation of JavaScript values.

- self.browser.tabs[0].ExecuteJavaScript(

- """console.time('telemetry.internal.{0}.end');""".format(

- self.identifier))

- # TODO(catapult:#3028): Fix interpolation of JavaScript values.

- self.browser.tabs[0].ExecuteJavaScript(

- """console.timeEnd('telemetry.internal.{0}.end');""".format(

- self.identifier))

+ marker = 'telemetry.internal.%s.start' % self.identifier

+ self.browser.tabs[0].ExecuteJavaScript2(

+ "console.time({{ marker }});", marker=marker)

+ self.browser.tabs[0].ExecuteJavaScript2(

+ "console.timeEnd({{ marker }});", marker=marker)

return True

def EnsurePageCacheTemperature(page, browser, previous_page=None):