Move site_chrome_test, site_logging, site_log_reader, site_crash_test into cros dir.

client/cros/login.py

 # Copyright (c) 2010 The Chromium OS 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 errno, logging, os, re, signal, subprocess, time
 import common
-import constants as chromeos_constants, cryptohome, ui
-from autotest_lib.client.bin import test, utils, site_log_reader
+import constants as chromeos_constants, cros_logging, cryptohome, ui
+from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import error
 
 
 _DEFAULT_TIMEOUT = 30
 
 
 class TimeoutError(error.TestError):
     """Error raised when we time out while waiting on a condition."""
     pass
 
@@ skipping 112 matching lines @@
                  (username, password))
 
     if not __get_session_manager_pid():
         raise UnexpectedCondition("Session manager is not running")
 
     if logged_in():
         raise UnexpectedCondition("Already logged in")
 
     # Mark /var/log/messages now; we'll run through all subsequent log messages
     # if we couldn't log in to see if the browser crashed.
-    log_reader = site_log_reader.LogReader()
+    log_reader = cros_logging.LogReader()
     log_reader.set_start_by_current()
 
     ax = ui.get_autox()
     # navigate to login screen
     ax.send_hotkey("Ctrl+Alt+L")
     # escape out of any login screen menus (e.g., the network selection menu)
     ax.send_hotkey("Escape")
     time.sleep(0.5)
     if (username):
         # focus username
@@ skipping 26 matching lines @@
         TimeoutError: logout didn't complete before timeout
         UnexpectedCondition: user is not logged in
     """
     if not logged_in():
         raise UnexpectedCondition('Already logged out')
 
     oldpid = __get_session_manager_pid()
 
     # Mark /var/log/messages now; we'll run through all subsequent log messages
     # if we couldn't TERM and restart the session manager.
-    log_reader = site_log_reader.LogReader()
+
+    log_reader = cros_logging.LogReader()
     log_reader.set_start_by_current()
 
     # Gracefully exiting the session manager causes the user's session to end.
     utils.system('pkill -TERM -o ^%s$' % chromeos_constants.SESSION_MANAGER)
 
     wait_for_condition(
         condition=lambda: __session_manager_restarted(oldpid),
         timeout_msg='Timed out waiting for logout',
         timeout=timeout,
         process='session_manager',
         log_reader=log_reader,
         crash_msg='session_manager crashed while shutting down.')
 
 
 def wait_for_browser(timeout=_DEFAULT_TIMEOUT):
     """Wait until a Chrome process is running.
 
     Args:
         timeout: float number of seconds to wait
 
     Raises:
         TimeoutError: Chrome didn't start before timeout
     """
     # Mark /var/log/messages now; we'll run through all subsequent log messages
     # if we couldn't start chrome to see if the browser crashed.
-    log_reader = site_log_reader.LogReader()
+    log_reader = cros_logging.LogReader()
     log_reader.set_start_by_current()
     wait_for_condition(
         lambda: os.system('pgrep ^%s$' % chromeos_constants.BROWSER) == 0,
         timeout_msg='Timed out waiting for Chrome to start',
         timeout=timeout,
         process='chrome',
         log_reader=log_reader,
         crash_msg='Chrome crashed while starting up.')
 
 
 def wait_for_cryptohome(timeout=_DEFAULT_TIMEOUT):
     """Wait until cryptohome is mounted.
 
     Args:
         timeout: float number of seconds to wait
 
     Raises:
         TimeoutError: cryptohome wasn't mounted before timeout
     """
     # Mark /var/log/messages now; we'll run through all subsequent log messages
     # if we couldn't get the browser up to see if the browser crashed.
-    log_reader = site_log_reader.LogReader()
+    log_reader = cros_logging.LogReader()
     log_reader.set_start_by_current()
     wait_for_condition(
         condition=lambda: cryptohome.is_mounted(),
         timeout_msg='Timed out waiting for cryptohome to be mounted',
         timeout=timeout,
         process='cryptohomed',
         log_reader=log_reader,
         crash_msg='cryptohomed crashed during mount attempt')
 
 
 def wait_for_login_prompt(timeout=_DEFAULT_TIMEOUT):
     """Wait the login prompt is on screen and ready
 
     Args:
         timeout: float number of seconds to wait
 
     Raises:
         TimeoutError: Login prompt didn't get up before timeout
     """
     # Mark /var/log/messages now; we'll run through all subsequent log messages
     # if we couldn't get the browser up to see if the browser crashed.
-    log_reader = site_log_reader.LogReader()
+    log_reader = cros_logging.LogReader()
     log_reader.set_start_by_current()
     wait_for_condition(
         condition=lambda: os.access(
             chromeos_constants.LOGIN_PROMPT_READY_MAGIC_FILE, os.F_OK),
         timeout_msg='Timed out waiting for login prompt',
         timeout=timeout,
         process='chrome',
         log_reader=log_reader,
         crash_msg='Chrome crashed before the login prompt.')
 
@@ skipping 17 matching lines @@
     """Wait until the initial Chrome window is mapped.
 
     Args:
       timeout: float number of seconds to wait
 
     Raises:
         TimeoutError: Chrome window wasn't mapped before timeout
     """
     # Mark /var/log/messages now; we'll run through all subsequent log messages
     # if we couldn't get the browser up to see if the browser crashed.
-    log_reader = site_log_reader.LogReader()
+    log_reader = cros_logging.LogReader()
     log_reader.set_start_by_current()
     wait_for_condition(
         lambda: os.access(
             chromeos_constants.CHROME_WINDOW_MAPPED_MAGIC_FILE, os.F_OK),
         'Timed out waiting for initial Chrome window',
         timeout=timeout,
         process='chrome',
         log_reader=log_reader,
         crash_msg='Chrome crashed before first tab rendered.')
 
@@ skipping 60 matching lines @@
     except (IOError, OSError) as error:
         logging.error(error)
 
     # Restart the UI.
     nuke_login_manager()
     utils.poll_for_condition(
         lambda: __session_manager_restarted(oldpid),
         TimeoutError('Timed out waiting for logout'),
         timeout)
     wait_for_login_prompt()