| Index: tools/chrome_remote_control/chrome_remote_control/page_runner.py
|
| diff --git a/tools/chrome_remote_control/chrome_remote_control/page_runner.py b/tools/chrome_remote_control/chrome_remote_control/page_runner.py
|
| index a3344144d0432a76e6d3b23d3398ff58a2cf6b47..8b7498da5d016e06839dbdcefef2dc58f42993b6 100644
|
| --- a/tools/chrome_remote_control/chrome_remote_control/page_runner.py
|
| +++ b/tools/chrome_remote_control/chrome_remote_control/page_runner.py
|
| @@ -27,6 +27,7 @@ class PageRunner(object):
|
|
|
| def Run(self, options, possible_browser, test, results):
|
| with possible_browser.Create() as browser:
|
| + browser.SetCredentialsConfigFile(self.page_set.credentials_path)
|
| with browser.ConnectToNthTab(0) as tab:
|
| for page in self.page_set:
|
| self._RunPage(options, page, tab, test, results)
|
| @@ -41,7 +42,7 @@ class PageRunner(object):
|
| page.url, traceback.format_exc())
|
| raise
|
| finally:
|
| - self.CleanUpPage()
|
| + self.CleanUpPage(page, tab)
|
|
|
| try:
|
| test.Run(options, page, tab, results)
|
| @@ -58,7 +59,7 @@ class PageRunner(object):
|
| page.url, traceback.format_exc())
|
| raise
|
| finally:
|
| - self.CleanUpPage()
|
| + self.CleanUpPage(page, tab)
|
|
|
| def Close(self):
|
| if self._server:
|
| @@ -78,6 +79,9 @@ class PageRunner(object):
|
| self._server = tab.browser.CreateTemporaryHTTPServer(dirname)
|
| page.url = self._server.UrlOf(filename)
|
|
|
| + if page.credentials:
|
| + tab.LoginNeeded(page.credentials)
|
| +
|
| tab.page.Navigate(page.url)
|
| # TODO(dtu): Detect HTTP redirects.
|
| if page.wait_time_after_navigate:
|
| @@ -85,5 +89,6 @@ class PageRunner(object):
|
| time.sleep(page.wait_time_after_navigate)
|
| tab.WaitForDocumentReadyStateToBeInteractiveOrBetter()
|
|
|
| - def CleanUpPage(self):
|
| - pass
|
| + def CleanUpPage(self, page, tab): # pylint: disable=R0201
|
| + if page.credentials:
|
| + tab.LoginNoLongerNeeded(page.credentials)
|
|
|