Don't log chrome SIGABRT crashes during logout.

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, cros_logging, cros_ui, cryptohome
 from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import error
 
 
 _DEFAULT_TIMEOUT = 30
 
+# Log messages used to signal when we're in a logout situation. Used to detect
+# crashes by cros_ui_test.UITest.
+LOGOUT_ATTEMPT_MSG = 'cros/login.py: Attempting logout...'
+LOGOUT_COMPLETE_MSG = 'cros/login.py: Logout complete.'
+
 
 class TimeoutError(error.TestError):
     """Error raised when we time out while waiting on a condition."""
     pass
 
 
 class CrashError(error.TestError):
     """Error raised when a pertinent process crashes while waiting on
     a condition.
     """
@@ skipping 150 matching lines @@
     Args:
         timeout: float number of seconds to wait
 
     Raises:
         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()
+    # Log what we're about to do to /var/log/messages. Used to log crashes later
+    # in cleanup by cros_ui_test.UITest.
+    utils.system('logger "%s"' % LOGOUT_ATTEMPT_MSG)
 
-    # Mark /var/log/messages now; we'll run through all subsequent log messages
-    # if we couldn't TERM and restart the session manager.
+    try:
+      oldpid = __get_session_manager_pid()
 
-    log_reader = cros_logging.LogReader()
-    log_reader.set_start_by_current()
+      # Mark /var/log/messages now; we'll run through all subsequent log
+      # messages if we couldn't TERM and restart the session manager.
 
-    # Gracefully exiting the session manager causes the user's session to end.
-    utils.system('pkill -TERM -o ^%s$' % constants.SESSION_MANAGER)
+      log_reader = cros_logging.LogReader()
+      log_reader.set_start_by_current()
 
-    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.')
+      # Gracefully exiting the session manager causes the user's session to end.
+      utils.system('pkill -TERM -o ^%s$' % 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.')
+    finally:
+      utils.system('logger "%s"' % LOGOUT_COMPLETE_MSG)
 
 
 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
@@ skipping 168 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()