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

Unified Diff: telemetry/telemetry/internal/actions/load_media.py

Issue 2559503002: [Telemetry] Fix JavaScript interpolation in telemetry actions (Closed)
Patch Set: inline js literals Created 4 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
Index: telemetry/telemetry/internal/actions/load_media.py
diff --git a/telemetry/telemetry/internal/actions/load_media.py b/telemetry/telemetry/internal/actions/load_media.py
index 463ad4ebc406ee670f85428fa31e3e2b2afcdaa3..e7146dc323e0716182ceee5856bf737557ba8a09 100644
--- a/telemetry/telemetry/internal/actions/load_media.py
+++ b/telemetry/telemetry/internal/actions/load_media.py
@@ -6,6 +6,7 @@ from telemetry.core import exceptions
from telemetry.internal.actions import media_action
from telemetry.internal.actions import page_action
from telemetry.internal.actions import utils
+from telemetry.util import js_template
class LoadMediaAction(media_action.MediaAction):
@@ -25,10 +26,12 @@ class LoadMediaAction(media_action.MediaAction):
utils.InjectJavaScript(tab, 'load_media.js')
def RunAction(self, tab):
+ # TODO(catapult:#3028): Render in JavaScript method when supported by API.
+ code = js_template.Render(
+ 'window.__loadMediaAndAwait({{ selector }}, {{ event }});',
+ selector=self._selector, event=self._event_to_await)
try:
- # TODO(catapult:#3028): Fix interpolation of JavaScript values.
- tab.ExecuteJavaScript('window.__loadMediaAndAwait("%s", "%s");'
- % (self._selector, self._event_to_await))
+ tab.ExecuteJavaScript(code)
if self._timeout_in_seconds > 0:
self.WaitForEvent(tab, self._selector, self._event_to_await,
self._timeout_in_seconds)
« no previous file with comments | « telemetry/telemetry/internal/actions/drag.py ('k') | telemetry/telemetry/internal/actions/load_media_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698