Index: functional/passwords.py |
=================================================================== |
--- functional/passwords.py (revision 98387) |
+++ functional/passwords.py (working copy) |
@@ -102,9 +102,10 @@ |
self.PerformActionOnInfobar('accept', infobar_index=0) |
self.NavigateToURL(url_logout) |
self.AppendTab(pyauto.GURL(url_https)) # New tab to avoid bug 70694 |
- # Wait until accounts page load to detect value in username field. |
- self.WaitUntil(lambda: self.GetDOMValue('document.readyState', 0, 1), |
- expect_retval='complete') |
+ # Wait until username is filled by the Password manager on the login page. |
+ self.WaitUntil( |
Nirnimesh
2011/08/28 07:15:16
wrap inside assertTrue
Venkat Yellapu
2011/08/30 00:03:03
Done.
|
+ lambda: self.GetDOMValue('document.getElementById("Email").value', |
+ 0, 0) != "") |
test_utils.VerifyGoogleAccountCredsFilled(self, username, password, |
tab_index=1, windex=0) |
self.ExecuteJavascript('document.getElementById("gaia_loginform").submit();' |
@@ -180,11 +181,14 @@ |
"""Test that Password infobar disappears by the page reload.""" |
creds = self.GetPrivateInfo()['test_google_account'] |
# Login to Google a/c |
+ raw_input() |
Nirnimesh
2011/08/28 07:15:16
??
Venkat Yellapu
2011/08/30 00:03:03
Done.
|
test_utils.GoogleAccountsLogin(self, creds['username'], creds['password']) |
+ raw_input() |
Nirnimesh
2011/08/28 07:15:16
??
Venkat Yellapu
2011/08/30 00:03:03
Done.
|
# Wait for the infobar to appear |
self.assertTrue(self.WaitForInfobarCount(1)) |
self.assertTrue(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars']) |
self.GetBrowserWindow(0).GetTab(0).Reload() |
+ raw_input() |
Nirnimesh
2011/08/28 07:15:16
??
Please run the tests before submitting for rev
Venkat Yellapu
2011/08/30 00:03:03
Done.
|
self.assertTrue(self.WaitForInfobarCount(0)) |
self.assertFalse(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars']) |
@@ -250,8 +254,13 @@ |
'https://www.google.com/accounts/ServiceLogin') |
url = 'https://www.google.com/accounts/ServiceLogin' |
- self.AddSavedPassword(user_creds) |
- self.NavigateToURL(url) |
+ user_creds = self.GetPrivateInfo()['test_google_account'] |
+ test_utils.GoogleAccountsLogin(self, user_creds['username'], user_creds['password']) |
Nirnimesh
2011/08/28 07:15:16
80+ chars not allowed
Venkat Yellapu
2011/08/30 00:03:03
I'm not going to change this function in this CL.
|
+ |
+ #self.AddSavedPassword(user_creds) |
+ raw_input() |
Nirnimesh
2011/08/28 07:15:16
??
Venkat Yellapu
2011/08/30 00:03:03
Done.
|
+ #self.NavigateToURL(url) |
+ #raw_input() |
self.WaitUntil( |
lambda: self.GetDOMValue('document.readyState'), |
expect_retval='complete') |