Fix password automation hooks to get pyauto test testSavePassword working.

chrome/test/functional/passwords.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
 import test_utils
 
 
 class PasswordTest(pyauto.PyUITest):
   """Tests that passwords work correctly."""
 
   def Debug(self):
     """Test method for experimentation.
 
     This method will not run automatically.
     """
     while True:
       raw_input('Interact with the browser and hit <enter> to dump passwords. ')
       print '*' * 20
       import pprint
       pp = pprint.PrettyPrinter(indent=2)
       pp.pprint(self.GetSavedPasswords())
 
+  def setUp(self):
+    pyauto.PyUITest.setUp(self)
+    self.assertEqual(self.GetSavedPasswords(), [])

[Nirnimesh, 2011/05/17 20:23:25]

self.assertFalse(self.GetSavedPasswords())

+
   def _AssertWithinOneSecond(self, time1, time2):
     self.assertTrue(abs(time1 - time2) < 1.0,
                     'Times not within an acceptable range. '
                     'First was %lf, second was %lf' % (time1, time2))
 
   def _ConstructPasswordDictionary(self, username_value, password_value,
                                    signon_realm, origin_url, username_element,
                                    password_element, action_target,
                                    time=1279650942.0, submit_element='submit',
                                    blacklist=False):
     """Construct a password dictionary with all the required fields."""
     return {'username_value': username_value,
             'password_value': password_value,
             'signon_realm': signon_realm,
             'time': time,
             'origin_url': origin_url,
             'username_element': username_element,
             'password_element': password_element,
             'submit_element': submit_element,
             'action_target': action_target,
             'blacklist': blacklist}
 
   def testSavePassword(self):
     """Test saving a password and getting saved passwords."""
     password1 = self._ConstructPasswordDictionary(
         'user@example.com', 'test.password',
         'https://www.example.com/', 'https://www.example.com/login',
         'username', 'password', 'https://www.example.com/login/')
     self.assertTrue(self.AddSavedPassword(password1))
-    self.assertEquals(self.GetSavedPasswords(), [password1])
+    self.assertEqual(self.GetSavedPasswords(), [password1])
 
   def testRemovePasswords(self):
     """Verify that saved passwords can be removed."""
     password1 = self._ConstructPasswordDictionary(
         'user1@example.com', 'test1.password',
         'https://www.example.com/', 'https://www.example.com/login',
         'username1', 'password', 'https://www.example.com/login/')
     password2 = self._ConstructPasswordDictionary(
         'user2@example.com', 'test2.password',
         'https://www.example.com/', 'https://www.example.com/login',
@@ skipping 199 matching lines @@
     self.ExecuteJavascript(set_focus, 0, 0)
     self._SendCharToPopulateField('t', tab_index=0, windex=0)
     passwd_value = self.GetDOMValue('document.getElementById("Passwd").value')
     self.assertFalse(passwd_value,
                      msg='Password field not empty for new username.')
     test_utils.ClearPasswords(self)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()