tools/perf/page_sets/login_helpers/google_login.py - Issue 2618333006: [tools/perf] Fix JavaScript interpolation in action_runner calls

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/perf/page_sets/login_helpers/google_login.py

Issue 2618333006: [tools/perf] Fix JavaScript interpolation in action_runner calls (Closed)

Patch Set: fix a few more interpolations 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: tools/perf/page_sets/login_helpers/google_login.py

diff --git a/tools/perf/page_sets/login_helpers/google_login.py b/tools/perf/page_sets/login_helpers/google_login.py

index 9c5a14e81779795991ca4c0d437368098f2479c3..a1108e4ce6185922faeaf1798672444c70c4fa03 100644

--- a/tools/perf/page_sets/login_helpers/google_login.py

+++ b/tools/perf/page_sets/login_helpers/google_login.py

@@ -43,9 +43,8 @@ def LoginGoogleAccount(action_runner,

'https%3A%2F%2Faccounts.google.com%2FManageAccount')

# Wait until either the email or password input is visible.

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

- action_runner.WaitForJavaScriptCondition('%s || %s' % (

- _EMAIL_INPUT_VISIBLE_CONDITION, _PASSWORD_INPUT_VISIBLE_CONDITION))

+ action_runner.WaitForJavaScriptCondition('{{ @a }} || {{ @b }}',

+ a=_EMAIL_INPUT_VISIBLE_CONDITION, b=_PASSWORD_INPUT_VISIBLE_CONDITION)

# If the email input is visible, this is the first Google login within the

# browser session, so we must enter both email and password. Otherwise, only