[chromedriver] Clean tmp directory and kill Chrome processes before each run cycle.

chrome/test/chromedriver/run_all_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs all ChromeDriver end to end tests."""
 
+import atexit
 import optparse
 import os
+import shutil
 import sys
 
 _THIS_DIR = os.path.abspath(os.path.dirname(__file__))
 sys.path.insert(0, os.path.join(_THIS_DIR, os.pardir, 'pylib'))
 
 from common import chrome_paths
 from common import util
 import continuous_archive
 
 
@@ skipping 64 matching lines @@
 
 
 def RunCppTests(cpp_tests):
   print '@@@BUILD_STEP chromedriver2_tests@@@'
   code = util.RunCommand([cpp_tests])
   if code:
     print '@@@STEP_FAILURE@@@'
   return code
 
 
+def KillChromes(chrome_path):

[kkania, 2013/04/29 18:25:43]

i think it would make more sense to put all this in the run_buildbot_steps.py
script, which is only intended to be run on the bots

[chrisgao (Use stgao instead), 2013/04/29 22:10:26]

Done.

+  if util.IsWindows():
+    util.RunCommand(['taskkill', '/F', '/IM', os.path.basename(chrome_path)])
+  else:
+    util.RunCommand(['pkill', '-9', os.path.basename(chrome_path)])

[chrisgao (Use stgao instead), 2013/04/27 00:48:43]

Is there a way to kill the chrome processes based on the path to the chrome
binary?
When based on name, chrome started with binary in another path will also be
killed. This is bad for testing locally.

[craigdh, 2013/04/29 17:31:40]

This also doesn't work on Android, for obvious reasons. It's not a very big deal
as adb_commands.py restarts chrome anyway.

[chrisgao (Use stgao instead), 2013/04/29 22:10:26]

Right, let us just ignore Android.

+
+
+def CleanTmpDir():
+  tmp_dir = os.path.dirname(util.MakeTempDir())
+  print 'cleaning temp directory:', tmp_dir
+  for file_name in os.listdir(tmp_dir):
+    if not os.path.isdir(os.path.join(tmp_dir, file_name)):
+      continue
+    if file_name.startswith('jetty-0.0.0.0-') or file_name.startswith('tmp'):
+      print 'deleting sub-directory', file_name
+      shutil.rmtree(os.path.join(tmp_dir, file_name), True)
+
+
 def main():
   parser = optparse.OptionParser()
   parser.add_option(
       '', '--android-package',
       help='Application package name, if running tests on Android.')
   # Option 'chrome-version' is for desktop only.
   parser.add_option(
       '', '--chrome-version',
       help='Version of chrome, e.g., \'HEAD\', \'27\', or \'26\'.'
            'Default is to run tests against all of these versions.'
@@ skipping 31 matching lines @@
   chromedriver_server = os.path.join(build_dir, server_name)
 
   if util.IsLinux():
     # Set LD_LIBRARY_PATH to enable successful loading of shared object files,
     # when chromedriver2.so is not a static build.
     _AppendEnvironmentPath('LD_LIBRARY_PATH', os.path.join(build_dir, 'lib'))
   elif util.IsWindows():
     # For Windows bots: add ant, java(jre) and the like to system path.
     _AddToolsToSystemPathForWindows()
 
+  CleanTmpDir()
+  atexit.register(CleanTmpDir)

[craigdh, 2013/04/29 17:31:40]

It would be more pythonic to have a try/finally block and put this in the
finally.

[chrisgao (Use stgao instead), 2013/04/29 22:10:26]

Done.

   if options.android_package:
     os.environ['PATH'] += os.pathsep + os.path.join(_THIS_DIR, 'chrome')
     code1 = RunPythonTests(chromedriver,
                            android_package=options.android_package)
     code2 = RunJavaTests(chromedriver_server,
                          android_package=options.android_package)
     return code1 or code2
   else:
     chrome_tip_of_tree = os.path.join(build_dir, chrome_name)
     cpp_tests = os.path.join(build_dir, cpp_tests_name)
 
     chrome_26 = continuous_archive.DownloadChrome(
         continuous_archive.CHROME_26_REVISION, util.MakeTempDir())
     chrome_27 = continuous_archive.DownloadChrome(
         continuous_archive.CHROME_27_REVISION, util.MakeTempDir())
     chrome_path_versions = [
         {'path': chrome_tip_of_tree, 'version': 'HEAD'},
         {'path': chrome_27, 'version': '27'},
         {'path': chrome_26, 'version': '26'},
     ]
     code = 0
     for chrome in chrome_path_versions:
       if options.chrome_version and chrome['version'] != options.chrome_version:
         continue
 
       code1 = RunPythonTests(chromedriver, chrome=chrome['path'],
                              chrome_version=chrome['version'])
       code2 = RunJavaTests(chromedriver_server, chrome=chrome['path'],
                            chrome_version=chrome['version'])
+      KillChromes(chrome['path'])
       code = code or code1 or code2
     return RunCppTests(cpp_tests) or code
 
 
 if __name__ == '__main__':
   sys.exit(main())