[chromedriver] Add option to relaunch the test harness after each java test for debugging.

chrome/test/chromedriver/run_java_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 the WebDriver Java acceptance tests.
 
 This script is called from chrome/test/chromedriver/run_all_tests.py and reports
 results using the buildbot annotation scheme.
 
@@ skipping 222 matching lines @@
   parser.add_option(
       '', '--chrome-version', default='HEAD',
       help='Version of chrome. Default is \'HEAD\'')
   parser.add_option(
       '', '--android-package', type='string', default=None,
       help='Name of Chrome\'s Android package')
   parser.add_option(
       '', '--filter', type='string', default=None,
       help='Filter for specifying what tests to run, "*" will run all. E.g., '
            '*testShouldReturnTitleOfPageIfSet')
+  parser.add_option(
+      '', '--relaunch', action='store_true', default=False,

[frankf, 2013/04/16 23:21:35]

this could be better name. Some suggestions:

run_separate
isolate_tests

+      help='Relaunch the jar test harness after each test')
   options, args = parser.parse_args()
 
   if options.chromedriver is None or not os.path.exists(options.chromedriver):
     parser.error('chromedriver is required or the given path is invalid.' +
                  'Please run "%s --help" for help' % __file__)
 
   if options.android_package is not None:
     if options.chrome_version != 'HEAD':
       parser.error('Android does not support the --chrome-version argument.')
     environment = test_environment.AndroidTestEnvironment()
   else:
     environment = test_environment.DesktopTestEnvironment(
         options.chrome_version)
 
   try:
     environment.GlobalSetUp()
     # Run passed tests when filter is not provided.
-    test_filter = options.filter
-    if test_filter is None:
-      test_filter = environment.GetPassedJavaTestFilter()
+    if options.filter is None:

[frankf, 2013/04/16 23:21:35]

negate the conditional:

if options.filter:

+      if options.relaunch:
+        test_filters = environment.GetPassedJavaTests()
+      else:
+        test_filters = [environment.GetPassedJavaTestFilter()]
+    else:
+      test_filters = [options.filter]
 
     java_tests_src_dir = os.path.join(chrome_paths.GetSrc(), 'chrome', 'test',
                                       'chromedriver', 'third_party',
                                       'java_tests')
     if (not os.path.exists(java_tests_src_dir) or
         not os.listdir(java_tests_src_dir)):
       print ('"%s" is empty or it doesn\'t exist.' % java_tests_src_dir +
           'Should add "deps/third_party/webdriver" to source checkout config')
       return 1
 
-    return PrintTestResults(_Run(
-        java_tests_src_dir=java_tests_src_dir,
-        test_filter=test_filter,
-        chromedriver_path=options.chromedriver,
-        chrome_path=options.chrome,
-        android_package=options.android_package,
-        verbose=options.verbose,
-        debug=options.debug))
+    results = []
+    for filter in test_filters:
+      results += _Run(
+          java_tests_src_dir=java_tests_src_dir,
+          test_filter=filter,
+          chromedriver_path=options.chromedriver,
+          chrome_path=options.chrome,
+          android_package=options.android_package,
+          verbose=options.verbose,
+          debug=options.debug)
+    return PrintTestResults(results)
   finally:
     environment.GlobalTearDown()
 
 
 if __name__ == '__main__':
   sys.exit(main())