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

client/cros/chrome_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, subprocess, tempfile, utils
+import common

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

style is to put these all on one line.  Should you say "from" to make it
abundantly clear these are not system libs?

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

common is a very special hack by autotest design, you could see it was not
actually referred to use anywhere in the code. 

import common as a standalone line is an usual practice is autotest code, just
grep "import common" client/bin and client/common_lib, you will see sufficient
examples.

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

+import ui
 from autotest_lib.client.bin import test
-from autotest_lib.client.common_lib import error, global_config, site_ui
+from autotest_lib.client.common_lib import error, global_config
 
 class ChromeTestBase(test.test):
     home_dir = None
 
     def setup(self):
         self.job.setup_dep(['chrome_test'])
         # create a empty srcdir to prevent the error that checks .version file
         if not os.path.exists(self.srcdir):
             os.mkdir(self.srcdir)
 
@@ skipping 23 matching lines @@
         return filter(lambda(x): not matcher.match(x), tests)
 
 
     def list_chrome_tests(self, test_binary):
         all_tests = []
         try:
             cmd = '%s/%s --gtest_list_tests' % (self.test_binary_dir,
                                                 test_binary)
             cmd = 'HOME=%s CR_SOURCE_ROOT=%s %s' % (self.home_dir,
                                                     self.cr_source_dir,
-                                                    site_ui.xcommand(cmd))
+                                                    ui.xcommand(cmd))
             logging.debug("Running %s" % cmd)
             test_proc = subprocess.Popen(cmd,
                                          shell=True,
                                          stdout=subprocess.PIPE)
             last_suite = None
             skipper = re.compile('YOU HAVE')
             for line in test_proc.stdout:
                 stripped = line.lstrip()
                 if stripped == '' or skipper.match(stripped):
                     continue
                 elif (stripped == line):
                     last_suite = stripped.rstrip()
                 else:
                   all_tests.append(last_suite+stripped.rstrip())
         except OSError, e:
             logging.debug(e)
             raise error.TestFail('Failed to list tests in %s!' % test_binary)
         return all_tests
 
 
     def run_chrome_test(self, test_to_run, extra_params=''):
         try:
             cmd = '%s/%s %s' % (self.test_binary_dir, test_to_run, extra_params)
             cmd = 'HOME=%s CR_SOURCE_ROOT=%s %s' % (self.home_dir,
                                                     self.cr_source_dir,
-                                                    site_ui.xcommand(cmd))
+                                                    ui.xcommand(cmd))
             utils.system(cmd)
         except error.CmdError, e:
             logging.debug(e)
             raise error.TestFail('%s failed!' % test_to_run)
 
 
     def generate_test_list(self, binary, group, total_groups):
         all_tests = self.list_chrome_tests(self.binary_to_run)
         group_size = len(all_tests)/total_groups + 1  # to be safe
         return all_tests[group*group_size:group*group_size+group_size]
 
 
     def cleanup(self):
         if self.home_dir:
             shutil.rmtree(self.home_dir, ignore_errors=True)
         test.test.cleanup(self)