[Telemetry] Move from telemetry WaitFor to py_utils WaitFor

telemetry/telemetry/internal/backends/chrome/cros_unittest.py

 # Copyright 2014 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 urllib2
 import os
 
 from telemetry.core import exceptions
-from telemetry.core import util
 from telemetry import decorators
 from telemetry.internal.backends.chrome import cros_test_case
 
+import py_utils
+
 
 class CrOSCryptohomeTest(cros_test_case.CrOSTestCase):
   @decorators.Enabled('chromeos')
   def testCryptohome(self):
     """Verifies cryptohome mount status for regular and guest user and when
     logged out"""
     with self._CreateBrowser() as b:
       self.assertEquals(1, len(b.tabs))
       self.assertTrue(b.tabs[0].url)
       self.assertTrue(self._IsCryptohomeMounted())
@@ skipping 68 matching lines @@
   def testLogout(self):
     """Tests autotestPrivate.logout"""
     if self._is_guest:
       return
     with self._CreateBrowser(autotest_ext=True) as b:
       extension = self._GetAutotestExtension(b)
       try:
         extension.ExecuteJavaScript('chrome.autotestPrivate.logout();')
       except exceptions.Error:
         pass
-      util.WaitFor(lambda: not self._IsCryptohomeMounted(), 20)
+      py_utils.WaitFor(lambda: not self._IsCryptohomeMounted(), 20)
 
   @decorators.Disabled('all')
   def testGaiaLogin(self):
     """Tests gaia login. Use credentials in credentials.txt if it exists,
     otherwise use powerloadtest."""
     if self._is_guest:
       return
     username, password = self._GetCredentials()
     if not username or not password:
       username = 'powerloadtest@gmail.com'
       password = urllib2.urlopen(
           'https://sites.google.com/a/chromium.org/dev/chromium-os/testing/'
           'power-testing/pltp/pltp').read().rstrip()
     with self._CreateBrowser(gaia_login=True,
                              username=username,
                              password=password):
-      self.assertTrue(util.WaitFor(self._IsCryptohomeMounted, 10))
+      self.assertTrue(py_utils.WaitFor(self._IsCryptohomeMounted, 10))
 
   @decorators.Enabled('chromeos')
   def testEnterpriseEnroll(self):
     """Tests enterprise enrollment. Credentials are expected to be found in a
     credentials.txt file. The account must be from an enterprise domain and
     have device enrollment permission. The device must be unowned."""
     if self._is_guest:
       return
 
     username, password = self._GetCredentials()
     if not username or not password:
       return
     # Enroll the device.
     with self._CreateBrowser(auto_login=False) as browser:
       browser.oobe.NavigateGaiaLogin(username, password,
                                      enterprise_enroll=True,
                                      for_user_triggered_enrollment=True)
 
     # Check for the existence of the device policy file.
-    self.assertTrue(util.WaitFor(lambda: self._cri.FileExistsOnDevice(
+    self.assertTrue(py_utils.WaitFor(lambda: self._cri.FileExistsOnDevice(
         '/home/.shadow/install_attributes.pb'), 15))
 
 
 class CrOSScreenLockerTest(cros_test_case.CrOSTestCase):
   def _IsScreenLocked(self, browser):
     return self._GetLoginStatus(browser)['isScreenLocked']
 
   def _LockScreen(self, browser):
     self.assertFalse(self._IsScreenLocked(browser))
 
     extension = self._GetAutotestExtension(browser)
     self.assertTrue(extension.EvaluateJavaScript(
         "typeof chrome.autotestPrivate.lockScreen == 'function'"))
     logging.info('Locking screen')
     extension.ExecuteJavaScript('chrome.autotestPrivate.lockScreen();')
 
     logging.info('Waiting for the lock screen')
     def ScreenLocked():
       return (browser.oobe_exists and
           browser.oobe.EvaluateJavaScript("typeof Oobe == 'function'") and
           browser.oobe.EvaluateJavaScript(
           "typeof Oobe.authenticateForTesting == 'function'"))
-    util.WaitFor(ScreenLocked, 10)
+    py_utils.WaitFor(ScreenLocked, 10)
     self.assertTrue(self._IsScreenLocked(browser))
 
   def _AttemptUnlockBadPassword(self, browser):
     logging.info('Trying a bad password')
     def ErrorBubbleVisible():
       return not browser.oobe.EvaluateJavaScript('''
           document.getElementById('bubble').hidden
       ''')
     self.assertFalse(ErrorBubbleVisible())
     browser.oobe.ExecuteJavaScript('''
         Oobe.authenticateForTesting('%s', 'bad');
     ''' % self._username)
-    util.WaitFor(ErrorBubbleVisible, 10)
+    py_utils.WaitFor(ErrorBubbleVisible, 10)
     self.assertTrue(self._IsScreenLocked(browser))
 
   def _UnlockScreen(self, browser):
     logging.info('Unlocking')
     browser.oobe.ExecuteJavaScript('''
         Oobe.authenticateForTesting('%s', '%s');
     ''' % (self._username, self._password))
-    util.WaitFor(lambda: not browser.oobe_exists, 10)
+    py_utils.WaitFor(lambda: not browser.oobe_exists, 10)
     self.assertFalse(self._IsScreenLocked(browser))
 
   @decorators.Disabled('all')
   def testScreenLock(self):
     """Tests autotestPrivate.screenLock"""
     if self._is_guest:
       return
     with self._CreateBrowser(autotest_ext=True) as browser:
       self._LockScreen(browser)
       self._AttemptUnlockBadPassword(browser)
       self._UnlockScreen(browser)