| Index: chrome/test/functional/chromeos_login.py
|
| diff --git a/chrome/test/functional/chromeos_login.py b/chrome/test/functional/chromeos_login.py
|
| index 7b4a56bcb658b4504f30fc316c53008aa32aa3cf..09a7a0ea85f02ddfef9274e866c06d19610f6233 100755
|
| --- a/chrome/test/functional/chromeos_login.py
|
| +++ b/chrome/test/functional/chromeos_login.py
|
| @@ -317,7 +317,7 @@ class ChromeosLoginCachedCredentialsAddUser(pyauto.PyUITest):
|
| credentials['password'])
|
| )
|
|
|
| -class ChromeosLoginCachedCredentialsUserPod(pyauto.PyUITest):
|
| +class ChromeosLoginCachedCredentialsUserPod(ChromeosLogin):
|
| """TestCase for Logging into ChromeOS with cached credentials and
|
| invalid proxy settings.
|
| """
|
| @@ -331,7 +331,7 @@ class ChromeosLoginCachedCredentialsUserPod(pyauto.PyUITest):
|
| # so restart ui now.
|
| cros_ui.stop(allow_fail=True)
|
| cryptohome.remove_all_vaults()
|
| - cros_ui.start(wait_for_login_prompt=False)
|
| + cros_ui.start(wait_for_login_prompt=True)
|
| pyauto.PyUITest.setUp(self)
|
|
|
| def tearDown(self):
|
| @@ -354,12 +354,18 @@ class ChromeosLoginCachedCredentialsUserPod(pyauto.PyUITest):
|
| make it pass we need a hook that simply calls Login on the delegate
|
| in webui_login_display.cc ::ShowSigninScreenForCreds.
|
| """
|
| + credentials = self._ValidCredentials()
|
| self.testGoodLogin()
|
| self.Logout()
|
| - self.SetProxySettingOnChromeOS('singlehttp', '127.0.0.1')
|
| - self.testGoodLogin()
|
| - self.ResetProxySettingsOnChromeOS()
|
| -
|
| + proxy_dict = {
|
| + 'url_path': 'singlehttp',
|
| + 'proxy_url': '127.0.0.1',
|
| + }
|
| + self.SetProxySettingOnChromeOS(proxy_dict)
|
| + self.LoginWithCachedCredentials(credentials['username'],
|
| + credentials['password'])
|
| + login_info = self.GetLoginInfo()
|
| + self.assertTrue(login_info['is_logged_in'], msg='Login failed.')
|
|
|
| if __name__ == '__main__':
|
| pyauto_functional.Main()
|
|
|