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

client/cros/crash_test.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 logging, os, re, shutil
-from autotest_lib.client.bin import site_log_reader, site_utils, test
-from autotest_lib.client.common_lib import error, utils
+import common
+import log_reader
+from autotest_lib.client.bin import test, utils
+from autotest_lib.client.common_lib import error
 
 
 class CrashTest(test.test):
 
     _CONSENT_FILE = '/home/chronos/Consent To Send Stats'
     _CORE_PATTERN = '/proc/sys/kernel/core_pattern'
     _CRASH_REPORTER_PATH = '/sbin/crash_reporter'
     _CRASH_SENDER_PATH = '/sbin/crash_sender'
     _CRASH_SENDER_RATE_DIR = '/var/lib/crash_sender'
     _CRASH_SENDER_RUN_PATH = '/var/run/crash_sender.pid'
@@ skipping 186 matching lines @@
                 'sleep_time': sleep_time,
                 'output': output}
 
 
     def wait_for_sender_completion(self):
         """Wait for crash_sender to complete.
 
         Wait for no crash_sender's last message to be placed in the
         system log before continuing and for the process to finish.
         Otherwise we might get only part of the output."""
-        site_utils.poll_for_condition(
+        utils.poll_for_condition(

[kmixter1, 2010/12/16 03:12:57]

this is confusing with the utils that's part of common_lib. I would suggest
prefixing with site or cros.

[ericli, 2010/12/17 21:48:39]

cros_utils would be good. But due the massive number of occurrence of the
function, I would do that in another CL.

On 2010/12/16 03:12:57, kmixter1 wrote:

             lambda: self._log_reader.can_find('crash_sender done.'),
             timeout=60,
             exception=error.TestError(
               'Timeout waiting for crash_sender to emit done: ' +
               self._log_reader.get_logs()))
-        site_utils.poll_for_condition(
+        utils.poll_for_condition(
             lambda: utils.system('pgrep crash_sender',
                                  ignore_status=True) != 0,
             timeout=60,
             exception=error.TestError(
                 'Timeout waiting for crash_sender to finish: ' +
                 self._log_reader.get_logs()))
 
 
     def _call_sender_one_crash(self,
                                send_success=True,
@@ skipping 66 matching lines @@
     def enable_crash_filtering(self, name):
         self._replace_crash_reporter_filter_in('--filter_in=' + name)
 
 
     def disable_crash_filtering(self):
         self._replace_crash_reporter_filter_in('')
 
 
     def initialize(self):
         test.test.initialize(self)
-        self._log_reader = site_log_reader.LogReader()
+        self._log_reader = log_reader.LogReader()
         self._leave_crash_sending = True
         self._automatic_consent_saving = True
         self.enable_crash_filtering('none')
 
 
     def cleanup(self):
         self._reset_rate_limiting()
         self._clear_spooled_crashes()
         self._set_system_sending(self._leave_crash_sending)
         self._set_sending_mock(mock_enabled=False)
@@ skipping 33 matching lines @@
                 self._initialize_crash_reporter()
             # Disable crash_sender from running, kill off any running ones, but
             # set environment so crash_sender may run as a child process.
             self._set_system_sending(False)
             self._set_child_sending(True)
             self._kill_running_sender()
             self._reset_rate_limiting()
             if clear_spool_first:
                 self._clear_spooled_crashes()
             getattr(self, '_test_' + test_name)()