Handle Smart Lock for Android promotion screen.

components/proximity_auth/e2e_test/cros.py

 # Copyright 2015 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 logging
 import os
 import subprocess
 import sys
 import time
 
@@ skipping 199 matching lines @@
 
   Note: This does not include the app's background page.
   """
 
   class PairingState:
     """ The current state of the setup flow. """
     SCAN = 'scan'
     PAIR = 'pair'
     CLICK_FOR_TRIAL_RUN = 'click_for_trial_run'
     TRIAL_RUN_COMPLETED = 'trial_run_completed'
+    PROMOTE_SMARTLOCK_FOR_ANDROID = 'promote-smart-lock-for-android'
 
   def __init__(self, app_page, chromeos):
     """
     Args:
       app_page: Inspector page of the app window.
       chromeos: The parent Chrome wrapper.
     """
     self._app_page = app_page
     self._chromeos = chromeos
 
   @property
   def pairing_state(self):
     ''' Returns the state the app is currently in.
 
     Raises:
       ValueError: The current state is unknown.
     '''
     state = self._app_page.EvaluateJavaScript(
         'document.body.getAttribute("step")')
     if state == 'scan':
       return SmartLockApp.PairingState.SCAN
     elif state == 'pair':
       return SmartLockApp.PairingState.PAIR
+    elif state == 'promote-smart-lock-for-android':
+      return SmartLockApp.PairingState.PROMOTE_SMARTLOCK_FOR_ANDROID
     elif state == 'complete':
       button_text = self._app_page.EvaluateJavaScript(
           'document.getElementById("pairing-button").textContent')
       button_text = button_text.strip().lower()
       if button_text == 'try it out':
         return SmartLockApp.PairingState.CLICK_FOR_TRIAL_RUN
       elif button_text == 'done':
         return SmartLockApp.PairingState.TRIAL_RUN_COMPLETED
       else:
         raise ValueError('Unknown button text: %s', button_text)
@@ skipping 22 matching lines @@
   def PairPhone(self):
     """ Starts the step of finding nearby phones.
 
     The app must be in the PAIR state.
 
     Returns:
       True if pairing succeeded, else False.
     """
     assert(self.pairing_state == self.PairingState.PAIR)
     self._ClickPairingButton()
+    assert(

[Tim Song, 2015/08/03 21:42:19]

The PROMOTE_SMARTLOCK_FOR_ANDROID state doesn't always show up. You should wrap
this in an if-statement rather than an assert.

[vsankar, 2015/08/03 22:32:13]

Done.

+        self.pairing_state  == self.PairingState.PROMOTE_SMARTLOCK_FOR_ANDROID)
+    self._ClickPairingButton()
     return self.pairing_state == self.PairingState.CLICK_FOR_TRIAL_RUN
 
   def StartTrialRun(self):
     """ Starts the trial run.
 
     The app must be in the CLICK_FOR_TRIAL_RUN state.
 
     Raises:
       TimeoutException: Timed out starting the trial run.
     """
     assert(self.pairing_state == self.PairingState.CLICK_FOR_TRIAL_RUN)
     self._app_page.EvaluateJavaScript(
         'document.getElementById("pairing-button").click()')
     util.WaitFor(lambda: (self._chromeos.session_state ==
                           ChromeOS.SessionState.LOCK_SCREEN),
                  10)
 
   def DismissApp(self):
     """ Dismisses the app after setup is completed.
 
     The app must be in the TRIAL_RUN_COMPLETED state.
     """
     assert(self.pairing_state == self.PairingState.TRIAL_RUN_COMPLETED)
     self._app_page.EvaluateJavaScript(
         'document.getElementById("pairing-button").click()')
 
   def _ClickPairingButton(self):
+    # Waits are needed because the clicks occur before the button label changes.
+    time.sleep(2)

[Tim Song, 2015/08/03 21:42:18]

Can you reduce the time to 1 second? I think that should still be sufficient to
work around the race conditions.

[vsankar, 2015/08/03 22:32:13]

Done.

     self._app_page.EvaluateJavaScript(
         'document.getElementById("pairing-button").click()')
+    time.sleep(2)
     util.WaitFor(lambda: self._app_page.EvaluateJavaScript(
         '!document.getElementById("pairing-button").disabled'), 60)
+    time.sleep(2)
     util.WaitFor(lambda: self._app_page.EvaluateJavaScript(
         '!document.getElementById("pairing-button-title")'
         '.classList.contains("animated-fade-out")'), 5)
     util.WaitFor(lambda: self._app_page.EvaluateJavaScript(
         '!document.getElementById("pairing-button-title")'
         '.classList.contains("animated-fade-in")'), 5)
 
 
 class ChromeOS(object):
   """ Wrapper for a remote ChromeOS device.
@@ skipping 226 matching lines @@
     try:
       extensions = self._browser.extensions.GetByExtensionId(
           'mkaemigholebcgchlkbankmihknojeak')
     except KeyError:
       return None
     for extension_page in extensions:
       pathname = extension_page.EvaluateJavaScript('document.location.pathname')
       if pathname == page_name:
         return extension_page
     return None