Fix to enable the cached credentials login test

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
@@ skipping 4676 matching lines @@
     cmd_dict = { 'command': 'LoginAsGuest' }
     # Currently, logging in as guest causes session_manager to
     # restart Chrome, which will close the testing channel.
     # We need to call SetUp() again to reconnect to the new channel.
     assert self._WaitForInodeChange(
         self._named_channel_id,
         lambda: self._GetResultFromJSONRequest(cmd_dict, windex=None)), \
         'Chrome did not reopen the testing channel after login as guest.'
     self.SetUp()
 
+  def LoginWithCachedCredentials(self, username, password):

[beeps, 2012/09/18 17:59:14]

Mimics def Login except for the actual hook it calls

[craigdh, 2012/09/18 18:16:35]

Following my suggestion in testing_automation_provider_chromeos.cc, don't
duplicate this code. Instead give Login a use_cached_credentials option
(defaults to False).

[beeps, 2012/09/19 16:29:02]

Done.

+    """Login to chromeos with cached credentials.
+
+    Returns:
+      An error string if an error occured.
+      None otherwise.
+
+    Raises:
+      pyauto_errors.JSONInterfaceError if the automation call returns an error.
+    """
+    self._GetResultFromJSONRequest({'command': 'AddLoginEventObserver'},
+                                   windex=None)
+    cmd_dict = {
+        'command': 'LoginWithCachedCredentials',
+        'username': username,
+        'password': password,
+    }
+    self._GetResultFromJSONRequest(cmd_dict, windex=None)
+    self.AddDomEventObserver('loginfail', automation_id=4444)
+    try:
+      # TODO(craigdh): Add login failure events once PyAuto switches to mocked
+      # GAIA authentication.

[craigdh, 2012/09/18 18:16:35]

Please remove this todo, I already did this but missed removing the todo.

[beeps, 2012/09/19 16:29:02]

Done.

+      if self.GetNextEvent().get('name') == 'loginfail':
+        raise JSONInterfaceError('Login denied by auth server.')
+    except JSONInterfaceError as e:
+      raise JSONInterfaceError('Login failed. Perhaps Chrome crashed, '
+                               'failed to start, or the login flow is '
+                               'broken? Error message: %s' % str(e))
+
   def Login(self, username, password):
     """Login to chromeos.
 
     Waits until logged in and browser is ready.
     Should be displaying the login screen to work.
 
     Note that in case of webui auth-extension-based login, gaia auth errors
     will not be noticed here, because the browser has no knowledge of it. In
     this case the GetNextEvent automation command will always time out.
 
@@ skipping 1922 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()