commit 88a2babadec91f44481af7a6be90d89b0dcdf0e3
author Achuith Bhandarkar <achuith@chromium.org> Thu Jul 09 17:36:25 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sat Jul 18 02:23:18 2015 +0000
tree 6ca5d04477e616b60ef8204fa1c3728befee3b1b
parent 2a3cb54dcc3d51d91027e71d88c3558e933240a8

Fixes for enterprise_RemoraRequisition.

BUG=chromium:495847
TEST=enterprise_RemoraRequisition

Change-Id: I26adc9bd1f37e8289ed724ded068f29123a5eca6
Reviewed-on: https://chromium-review.googlesource.com/285652
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Trybot-Ready: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: David Abrahams <resetswitch@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>

client/common_lib/cros/enrollment.py

diff --git a/client/common_lib/cros/enrollment.py b/client/common_lib/cros/enrollment.py
index fda488f..66f112a 100644
--- a/client/common_lib/cros/enrollment.py
+++ b/client/common_lib/cros/enrollment.py
@@ -5,8 +5,7 @@
 import logging
 
 from autotest_lib.client.bin import utils
-from autotest_lib.client.common_lib.cros import chrome, tpm_utils
-from telemetry.core.platform import cros_interface
+from autotest_lib.client.common_lib.cros import chrome
 
 
 def _ExecuteOobeCmd(browser, cmd):
@@ -21,29 +20,11 @@
 
     @param browser: telemetry browser object.
     """
-    _cri = cros_interface.CrOSInterface()
-    pid = _cri.GetChromePid()
-    # This will restart the browser.
-    chrome.Chrome.did_browser_crash(
+    chrome.Chrome.wait_for_browser_restart(
             lambda: _ExecuteOobeCmd(browser,
                                     'Oobe.remoraRequisitionForTesting();'))
-    utils.poll_for_condition(lambda: pid != _cri.GetChromePid(), timeout=60)
     utils.poll_for_condition(lambda: browser.oobe_exists, timeout=30)
 
-    _ExecuteOobeCmd(browser, 'Oobe.skipToLoginForTesting();')
-    tpm_utils.SaveTPMPassword()
-
-
-def FinishEnrollment(oobe):
-    """Wait for enrollment to finish and dismiss the last enrollment screen.
-
-    @param oobe: telemetry oobe object.
-    """
-    oobe.WaitForJavaScriptExpression(
-            "document.getElementById('oauth-enrollment').className."
-            "search('oauth-enroll-state-success') != -1", 30)
-    oobe.EvaluateJavaScript('Oobe.enterpriseEnrollmentDone();')
-
 
 def RemoraEnrollment(browser, user_id, password):
     """Enterprise login for a Remora device.
@@ -53,5 +34,7 @@
     @param password: login credentials password.
     """
     SwitchToRemora(browser)
-    browser.oobe.NavigateGaiaLogin(user_id, password)
-    FinishEnrollment(browser.oobe)
+    chrome.Chrome.wait_for_browser_restart(
+            lambda: browser.oobe.NavigateGaiaLogin(
+                    user_id, password, enterprise_enroll=True,
+                    for_user_triggered_enrollment=False))