Add option to not nuke Chrome to chrome_test.py

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, stat, subprocess, tempfile
 import common
 import constants, cros_ui, login
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error, global_config
 
 class ChromeTestBase(test.test):
     home_dir = None
+    chrome_restart_disabled = False
 
     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)
 
+    def nuke_chrome(self):
+        try:
+            open(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE, 'w').close()
+            self.chrome_restart_disabled = True
+        except IOError, e:
+            logging.debug(e)
+            raise error.TestError('Failed to disable browser restarting.')
+        login.nuke_process_by_name(name=constants.BROWSER, with_prejudice=True)
 
-    def initialize(self):
+
+    def initialize(self, nuke_browser_norestart = True):

[Nirnimesh, 2011/04/05 22:45:50]

remove space around =

         self.home_dir = tempfile.mkdtemp()
         os.chmod(self.home_dir, stat.S_IROTH | stat.S_IWOTH |stat.S_IXOTH)
         dep = 'chrome_test'
         dep_dir = os.path.join(self.autodir, 'deps', dep)
         self.job.install_pkg(dep, 'dep', dep_dir)
         self.cr_source_dir = '%s/test_src' % dep_dir
         self.test_binary_dir = '%s/out/Release' % self.cr_source_dir
-        try:
-            open(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE, 'w').close()
-        except IOError, e:
-            logging.debug(e)
-            raise error.TestError('Failed to disable browser restarting.')
-        login.nuke_process_by_name(name=constants.BROWSER, with_prejudice=True)
+        if (nuke_browser_norestart):
+            self.nuke_chrome()
         try:
             setup_cmd = '/bin/sh %s/%s' % (self.test_binary_dir,
                                            'setup_test_links.sh')
             utils.system(setup_cmd)  # this might raise an exception
         except error.CmdError, e:
             raise error.TestError(e)
 
 
     def filter_bad_tests(self, tests):
         matcher = re.compile(".+\.(FLAKY|FAILS|DISABLED).+")
@@ skipping 41 matching lines @@
             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):
-        # Allow chrome to be restarted again.
-        os.unlink(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE)
+        if self.chrome_restart_disabled:
+            # Allow chrome to be restarted again.
+            os.unlink(constants.DISABLE_BROWSER_RESTART_MAGIC_FILE)
         # Reset the UI.
         login.nuke_login_manager()
         login.refresh_login_screen()
         if self.home_dir:
             shutil.rmtree(self.home_dir, ignore_errors=True)
         test.test.cleanup(self)