Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: client/cros/login.py

Issue 5740004: Move site_chrome_test, site_logging, site_log_reader, site_crash_test into cros dir. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master
Patch Set: patch Created 9 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: client/cros/login.py
diff --git a/client/cros/login.py b/client/cros/login.py
index c8b1f5023dfc75746d99a1d4f3fd870df6991656..b3872e049b9f2b0521859629b70282cf9666aa3d 100644
--- a/client/cros/login.py
+++ b/client/cros/login.py
@@ -4,8 +4,8 @@
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
@@ -138,7 +138,7 @@ def attempt_login(username, password, timeout=_DEFAULT_TIMEOUT):
# 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()
@@ -185,7 +185,8 @@ def attempt_logout(timeout=_DEFAULT_TIMEOUT):
# 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.
@@ -211,7 +212,7 @@ def wait_for_browser(timeout=_DEFAULT_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,
@@ -233,7 +234,7 @@ def wait_for_cryptohome(timeout=_DEFAULT_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(),
@@ -255,7 +256,7 @@ def wait_for_login_prompt(timeout=_DEFAULT_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(
@@ -293,7 +294,7 @@ def wait_for_initial_chrome_window(timeout=_DEFAULT_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(
« no previous file with comments | « client/cros/cros_ui_test.py ('k') | client/site_tests/audiovideo_PlaybackRecordSemiAuto/audiovideo_PlaybackRecordSemiAuto.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698