Add runtime=dartium webdriver support to test.dart

tools/testing/run_selenium.py

 #!/usr/bin/python
 
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 #
 
 """Script to actually open a browser and perform the test, and reports back with
 the result. It uses Selenium WebDriver when possible for running the tests. It
 uses Selenium RC for Safari.
@@ skipping 96 matching lines @@
   return source
 
 def parse_args(args=None):
   parser = optparse.OptionParser()
   parser.add_option('--out', dest='out',
       help = 'The path for html output file that we will running our test from',
       action = 'store', default = '')
   parser.add_option('--browser', dest='browser',
       help = 'The browser type (default = chrome)',
       action = 'store', default = 'chrome')
+  parser.add_option('--executable', dest='executable',
+      help = 'The browser executable path (only for browser=dartium)',
+      action = 'store', default = None)
   # TODO(efortuna): Put this back up to be more than the default timeout in
   # test.dart. Right now it needs to be less than 60 so that when test.dart
   # times out, this script also closes the browser windows.
   parser.add_option('--timeout', dest = 'timeout',
       help = 'Amount of time (seconds) to wait before timeout', type = 'int',
       action = 'store', default=58)
   parser.add_option('--mode', dest = 'mode',
       help = 'The type of test we are running',
       action = 'store', default='correctness')
-  args, ignored = parser.parse_args(args=args)
-  return args.out, args.browser, args.timeout, args.mode
+  args, _ = parser.parse_args(args=args)
+  if args.executable and args.browser != 'dartium':
+    print 'Executable path only supported when browser=dartium.'
+    sys.exit(1)
+  return args.out, args.browser, args.executable, args.timeout, args.mode
 
-def start_browser(browser, html_out):
+def start_browser(browser, executable_path, html_out):
   if browser == 'chrome':
     # Note: you need ChromeDriver *in your path* to run Chrome, in addition to
     # installing Chrome. Also note that the build bot runs have a different path
     # from a normal user -- check the build logs.
     return selenium.webdriver.Chrome()
   elif browser == 'dartium':
     script_dir = os.path.dirname(os.path.abspath(__file__))
     dartium_dir = os.path.join(script_dir, '..', '..', 'client', 'tests',
                                'dartium')
     options = selenium.webdriver.chrome.options.Options()
-    if platform.system() == 'Windows':
+    if executable_path is not None:
+      options.binary_location = executable_path
+    elif platform.system() == 'Windows':
       options.binary_location = os.path.join(dartium_dir, 'chrome.exe')
     elif platform.system() == 'Darwin':
       options.binary_location = os.path.join(dartium_dir, 'Chromium.app',
                                              'Contents', 'MacOS', 'Chromium')
     else:
       options.binary_location = os.path.join(dartium_dir, 'chrome')
     return selenium.webdriver.Chrome(chrome_options=options)
   elif browser == 'ff':
     profile = selenium.webdriver.firefox.firefox_profile.FirefoxProfile()
     profile.set_preference('dom.max_script_run_time', 0)
@@ skipping 91 matching lines @@
   # TODO(jmesserly): It'd be nice to shutdown gracefully in the event of a
   # SIGTERM. Unfortunately dart:io cannot send SIGTERM, see dartbug.com/1756.
   signal.signal(signal.SIGTERM, lambda number, frame: close_browser(browser))
 
   try:
     while True:
       line = sys.stdin.readline()
       if line == '--terminate\n':
         break
 
-      html_out, browser_name, timeout, mode = parse_args(line.split())
+      (html_out, browser_name, executable_path,
+       timeout, mode) = parse_args(line.split())
 
       # Sanity checks that test.dart is passing flags we can handle.
       if mode != 'correctness':
         print 'Batch test runner not compatible with perf testing'
         return 1
       if browser and current_browser_name != browser_name:
         print('Batch test runner got multiple browsers: %s and %s'
             % (current_browser_name, browser_name))
         return 1
 
       # Start the browser on the first run
       if browser is None:
         current_browser_name = browser_name
-        browser = start_browser(browser_name, html_out)
+        browser = start_browser(browser_name, executable_path, html_out)
 
       source = run_test_in_browser(browser, html_out, timeout, mode)
 
       # Test is done. Write end token to stderr and flush.
       sys.stderr.write('>>> EOF STDERR\n')
       sys.stderr.flush()
 
       # print one of:
       # >>> TEST {PASS, FAIL, OK, CRASH, FAIL, TIMEOUT}
       status = report_results(mode, source)
       if status == 0:
         print '>>> TEST PASS'
       elif source == TIMEOUT_ERROR_MSG:
         print '>>> TEST TIMEOUT'
       else:
         print '>>> TEST FAIL'
       sys.stdout.flush()
   finally:
     close_browser(browser)
 
 
 def main(args):
   # Run in batch mode if the --batch flag is passed.
   # TODO(jmesserly): reconcile with the existing args parsing
   if '--batch' in args:
     return run_batch_tests()
 
   # Run a single test
-  html_out, browser_name, timeout, mode = parse_args()
-  browser = start_browser(browser_name, html_out)
+  html_out, browser_name, executable_path, timeout, mode = parse_args()
+  browser = start_browser(browser_name, executable_path, html_out)
 
   try:
     output = run_test_in_browser(browser, html_out, timeout, mode)
     return report_results(mode, output)
   finally:
     close_browser(browser)
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv))