Commit 5983e37f authored by Juan Antonio Navarro Perez's avatar Juan Antonio Navarro Perez Committed by Commit Bot

[Telemetry refactor] Migrate proximity_auth client to new browser API

- Add explicit calls to SetUp-/CleanUpEnvironment.

TBR=tengs@chromium.org

Bug: 804292,801578
Change-Id: I54d0925b308867020ed69b4330abd529beb61d77
Reviewed-on: https://chromium-review.googlesource.com/881142Reviewed-by: default avatarJuan Antonio Navarro Pérez <perezju@chromium.org>
Commit-Queue: Juan Antonio Navarro Pérez <perezju@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532372}
parent 2ed89710
...@@ -365,6 +365,7 @@ class ChromeOS(object): ...@@ -365,6 +365,7 @@ class ChromeOS(object):
self._username = username self._username = username
self._password = password self._password = password
self._ssh_port = ssh_port self._ssh_port = ssh_port
self._browser_to_create = None
self._browser = None self._browser = None
self._cros_interface = None self._cros_interface = None
self._background_page = None self._background_page = None
...@@ -412,6 +413,8 @@ class ChromeOS(object): ...@@ -412,6 +413,8 @@ class ChromeOS(object):
def __exit__(self, *args): def __exit__(self, *args):
if self._browser is not None: if self._browser is not None:
self._browser.Close() self._browser.Close()
if self._browser_to_create is not None:
self._browser_to_create.CleanUpEnvironment()
if self._cros_interface is not None: if self._cros_interface is not None:
self._cros_interface.CloseConnection() self._cros_interface.CloseConnection()
for process in self._processes: for process in self._processes:
...@@ -455,11 +458,13 @@ class ChromeOS(object): ...@@ -455,11 +458,13 @@ class ChromeOS(object):
is_component=True) is_component=True)
finder_opts.extensions_to_load.append(easy_unlock_app) finder_opts.extensions_to_load.append(easy_unlock_app)
self._browser_to_create = browser_finder.FindBrowser(finder_opts)
self._browser_to_create.SetUpEnvironment(browser_opts)
retries = 3 retries = 3
while self._browser is not None or retries > 0: while self._browser is not None or retries > 0:
try: try:
browser_to_create = browser_finder.FindBrowser(finder_opts) self._browser = self._browser_to_create.Create()
self._browser = browser_to_create.Create(finder_opts);
break; break;
except (exceptions.LoginException) as e: except (exceptions.LoginException) as e:
logger.error('Timed out logging in: %s' % e); logger.error('Timed out logging in: %s' % e);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment