telemetry/telemetry/internal/actions/action_runner.py - Issue 2671693002: [Telemetry] Validate args in js_template rendering

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/internal/actions/action_runner.py

Issue 2671693002: [Telemetry] Validate args in js_template rendering (Closed)

Patch Set: fix old api Created 3 years, 11 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:

Index: telemetry/telemetry/internal/actions/action_runner.py

diff --git a/telemetry/telemetry/internal/actions/action_runner.py b/telemetry/telemetry/internal/actions/action_runner.py

index 3c1092d9dbd6a17114109d43cd94ac2de240d581..61aa5c571318db40285de8a0d8c58872dac70b7a 100644

--- a/telemetry/telemetry/internal/actions/action_runner.py

+++ b/telemetry/telemetry/internal/actions/action_runner.py

@@ -282,7 +282,7 @@ class ActionRunner(object):

'New clients should use WaitForJavaScriptCondition2. See go/catabug/3028')

def WaitForJavaScriptCondition(self, condition, **kwargs):

"""Wait for a JavaScript condition to become true."""

- timeout = kwargs.get('timeout_in_seconds', 60)

+ timeout = kwargs.pop('timeout_in_seconds', None) or 60

self._tab.WaitForJavaScriptCondition2(

js_template.Render(condition, **kwargs), timeout=timeout)