Switch back to the old method of launching the login flow while keeping some of the benefits of the…

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 67 matching lines @@
   raise
 
 # Should go after sys.path is set appropriately
 import bookmark_model
 import download_info
 import history_info
 import omnibox_info
 import plugins_info
 import prefs_info
 from pyauto_errors import JSONInterfaceError
-from pyauto_errors import LoginError
 from pyauto_errors import NTPThumbnailNotShownError
 import pyauto_utils
 import simplejson as json  # found in third_party
 
 _CHROME_DRIVER_FACTORY = None
 _HTTP_SERVER = None
 _REMOTE_PROXY = None
 _OPTIONS = None
 _BROWSER_PID = None
 
@@ skipping 2977 matching lines @@
           MutationObserver returns an error.
     """
     observer_id = self.AddDomMutationObserver('exists', xpath, attribute,
                                               expected_value, exec_js=exec_js,
                                               **kwargs)
     try:
       self.GetNextEvent(observer_id, timeout=timeout)
     except JSONInterfaceError:
       raise JSONInterfaceError(msg)
 
-  def _AddLoginEventObserver(self):
-    """Adds a LoginEventObserver associated with the AutomationEventQueue.
-
-    The LoginEventObserver will generate an event when login completes.
-
-    Returns:
-      The id of the created observer, which can be used with GetNextEvent(id)
-      and RemoveEventObserver(id).
-
-    Raises:
-      pyauto_errors.JSONInterfaceError if the automation call returns an error.
-    """
-    cmd_dict = {
-      'command': 'AddLoginEventObserver',
-    }
-    return self._GetResultFromJSONRequest(cmd_dict, windex=None)['observer_id']
-
   def GetNextEvent(self, observer_id=-1, blocking=True, timeout=-1):
     """Waits for an observed event to occur.
 
     The returned event is removed from the Event Queue. If there is already a
     matching event in the queue it is returned immediately, otherwise the call
     blocks until a matching event occurs. If blocking is disabled and no
     matching event is in the queue this function will immediately return None.
 
     Args:
       observer_id: The id of the observer to wait for, matches any event by
@@ skipping 1014 matching lines @@
         lambda: self._GetResultFromJSONRequest(cmd_dict, windex=None)), \
         'Chrome did not reopen the testing channel after login as guest.'
     self.SetUp()
 
   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.
+
+    Returns:
+      An error string if an error occured.
+      None otherwise.
+
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
-      pyauto_errors.LoginError if the login fails.
     """
-    observer_id = self._AddLoginEventObserver()
-    ret = self.ExecuteJavascriptInOOBEWebUI("""
-        chrome.send("completeLogin", ["%s", "%s"] );
-        window.domAutomationController.send("success");""" %
-        (username, password));
+    self._GetResultFromJSONRequest({'command': 'AddLoginEventObserver'},
+                                   windex=None)
+    cmd_dict = {
+        'command': 'SubmitLoginForm',
+        'username': username,
+        'password': password,
+    }
+    self._GetResultFromJSONRequest(cmd_dict, windex=None)
     try:
-      response = self.GetNextEvent(observer_id)
+      # TODO(craigdh): Add login failure events once PyAuto switches to mocked
+      # GAIA authentication.
+      self.GetNextEvent()
     except JSONInterfaceError as e:
-      raise JSONInterfaceError(
-          str(e) + '\n Perhaps Chrome crashed or login is broken?')
-    if 'error_string' in response:
-      raise LoginError(response['error_string'])
+      raise JSONInterfaceError('%s\nLogin failed. Perhaps Chrome crashed, '
+                               'failed to start, or the login flow is '
+                               'broken?' % str(e))
 
   def Logout(self):
     """Log out from ChromeOS and wait for session_manager to come up.
 
     This is equivalent to pressing the 'Sign out' button from the
     aura shell tray when logged in.
 
     Should be logged in to work. Re-initializes the automation channel
     after logout.
     """
@@ skipping 1620 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()