[chromedriver] Run tests on stable and beta channel chrome.

chrome/test/chromedriver/run_buildbot_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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 the buildbot steps for ChromeDriver except for update/compile."""
 
 import optparse
 import os
 import platform
@@ skipping 163 matching lines @@
     time.sleep(60)
   util.PrintAndFlush('Got snapshot revision %s' % snapshot_revision)
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option(
       '', '--android-package',
       help='Application package name, if running tests on Android.')
   parser.add_option(
+      '', '--android', action='store_true', default=False,
+      help='Run tests on stable and beta channels on Android.')

[frankf, 2013/08/20 18:13:50]

Why don't you just list the package names, instead of having two overlapping
options

+  parser.add_option(
       '-r', '--revision', type='string', default=None,
       help='Chromium revision')
   options, _ = parser.parse_args()
 
-  if not options.android_package:
+  if not options.android_package and not options.android:
     KillChromes()
   CleanTmpDir()
 
-  if options.android_package:
+  if options.android_package or options.android:
     Download()
   else:
     if not options.revision:
       parser.error('Must supply a --revision')
 
     if util.IsLinux() and platform.architecture()[0] == '64bit':
       Archive(options.revision)
 
     WaitForLatestSnapshot(options.revision)
 
   cmd = [
       sys.executable,
       os.path.join(_THIS_DIR, 'test', 'run_all_tests.py'),
   ]
   if options.android_package:
     cmd.append('--android-package=' + options.android_package)
+  if options.android:
+    cmd.append('--android')
 
   passed = (util.RunCommand(cmd) == 0)
 
   if not options.android_package and passed:
     MaybeRelease(options.revision)
 
 
 if __name__ == '__main__':
   main()