Rewrite of the EnrollEnterpriseDevice PyAuto automation hook for WebUI.

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 EnrollmentError
 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 4806 matching lines @@
     }
     self._GetResultFromJSONRequest(cmd_dict, windex=None)
 
   def EnrollEnterpriseDevice(self, user, password):
     """Enrolls an unenrolled device as an enterprise device.
 
     Expects the device to be unenrolled with the TPM unlocked. This is
     equivalent to pressing Ctrl-Alt-e to enroll the device from the login
     screen.
 
-    Returns:
-      An error string if the enrollment fails.
-      None otherwise.
-
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
+      pyauto_errors.EnrollmentError if the enrollment fails.
     """
-    cmd_dict = {
-        'command': 'EnrollEnterpriseDevice',
-        'user': user,
-        'password': password,
-    }
-    time.sleep(5) # TODO(craigdh): Block until Install Attributes is ready.
-    result = self._GetResultFromJSONRequest(cmd_dict, windex=None)
-    return result.get('error_string')
+    self._GetResultFromJSONRequest(
+        {'command': 'ShowEnterpriseWizard'}, windex=None)
+    observer_id = self._GetResultFromJSONRequest(
+        {'command': 'AddEnrollmentObserver'}, windex=None)['observer_id']
+    self.ExecuteJavascriptInOOBEWebUI("""
+        chrome.send("oauthEnrollCompleteLogin", ["%s", "%s"] );
+        window.domAutomationController.send("success");""" %
+        (user, password));
+    response = self.GetNextEvent(observer_id)
+    if 'error_string' in response:
+      raise EnrollmentError(response['error_string'])
 
   def GetUpdateInfo(self):
     """Gets the status of the ChromeOS updater.
 
     Returns:
       a dictionary.
       Samples:
       { u'status': u'idle',
         u'release_track': u'beta-channel'}
 
@@ skipping 835 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()