Add runtime=dartium webdriver support to test.dart

tools/testing/run_selenium.py

Index: tools/testing/run_selenium.py
diff --git a/tools/testing/run_selenium.py b/tools/testing/run_selenium.py
index 4d5a66f929e336f248e23fd056b2c802d759f043..937db218734a656fe27bf8571445c2e8382c8172 100755
--- a/tools/testing/run_selenium.py
+++ b/tools/testing/run_selenium.py
@@ -114,6 +114,9 @@ def parse_args(args=None):
   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.
@@ -123,10 +126,13 @@ def parse_args(args=None):
   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, browser_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
@@ -137,7 +143,9 @@ def start_browser(browser, html_out):
     dartium_dir = os.path.join(script_dir, '..', '..', 'client', 'tests',
                                'dartium')
     options = selenium.webdriver.chrome.options.Options()
-    if platform.system() == 'Windows':
+    if browser_path is not None:
+      options.binary_location = browser_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',
@@ -249,7 +257,8 @@ def run_batch_tests():
       if line == '--terminate\n':
         break
 
-      html_out, browser_name, timeout, mode = parse_args(line.split())
+      (html_out, browser_name, browser_path,
+       timeout, mode) = parse_args(line.split())

[Emily Fortuna, 2012/04/10 20:47:45]

should this line be indented? My read of the Google Python style is unclear
here.

Also, nit: can we call "browser_path" "executable_path" or some other name? When
I see "browser_path" I think of the URL that the browser is visiting instead of
the path to open the browser exeutable. But, it's fine if you prefer to keep the
name.

[vsm, 2012/04/10 22:11:44]

Going by the Google python elisp style.  Note, 'timeout' is aligned with
'html_out'.
Done.

[Emily Fortuna, 2012/04/10 22:22:59]

sgtm.

 
       # Sanity checks that test.dart is passing flags we can handle.
       if mode != 'correctness':
@@ -263,7 +272,7 @@ def run_batch_tests():
       # 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, browser_path, html_out)
 
       source = run_test_in_browser(browser, html_out, timeout, mode)
 
@@ -292,8 +301,8 @@ def main(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, browser_path, timeout, mode = parse_args()
+  browser = start_browser(browser_name, browser_path, html_out)
 
   try:
     output = run_test_in_browser(browser, html_out, timeout, mode)