Chromium Code Reviews| Index: telemetry/telemetry/internal/backends/chrome/oobe.py |
| diff --git a/telemetry/telemetry/internal/backends/chrome/oobe.py b/telemetry/telemetry/internal/backends/chrome/oobe.py |
| index 7d92add0df4ca6f2aedb4a07819d715ad14739b2..7e9e1b1e670fbe2befe6cf4c7ce496b2070cea40 100644 |
| --- a/telemetry/telemetry/internal/backends/chrome/oobe.py |
| +++ b/telemetry/telemetry/internal/backends/chrome/oobe.py |
| @@ -4,6 +4,7 @@ |
| from functools import partial |
| import logging |
| +import json |
| from telemetry.core import exceptions |
| from telemetry.core import util |
| @@ -41,8 +42,13 @@ class Oobe(web_contents.WebContents): |
| if self.EvaluateJavaScript("typeof %s == 'undefined'" % api): |
| raise exceptions.LoginException('%s js api missing' % api) |
| - js = api + '(' + ("'%s'," * len(args)).rstrip(',') + ');' |
| - self.ExecuteJavaScript(js % args) |
| + # Example values: |
| + # |api|: 'doLogin' |
| + # |args|: ['username', 'pass', True] |
| + # js: '{}({},{},{})' |
| + # js.format(...): 'doLogin("username","pass",true)' |
|
achuithb
2016/04/15 22:05:37
Thanks!
|
| + js = '{}(' + ('{},' * len(args)).rstrip(',') + ')' |
| + self.ExecuteJavaScript(js.format(api, *map(json.dumps, args))) |
| def NavigateGuestLogin(self): |
| """Logs in as guest.""" |