[Android] Run chromedriver tests on 'Android ChromeDriver Tests (dbg)' bot.

build/android/buildbot/bb_device_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.
 
 import collections
 import glob
 import json
 import multiprocessing
 import optparse
@@ skipping 41 matching lines @@
            'chrome:chrome/test/data/android/device_files',
            constants.CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR),
     I_TEST('AndroidWebView',
            'AndroidWebView.apk',
            'org.chromium.android_webview',
            'AndroidWebViewTest',
            'webview:android_webview/test/data/device_files',
            None),
     ])
 
-VALID_TESTS = set(['ui', 'unit', 'webkit', 'webkit_layout'])
+VALID_TESTS = set(['chromedriver', 'ui', 'unit', 'webkit', 'webkit_layout'])
 
 
 
 def SpawnCmd(command):
   """Spawn a process without waiting for termination."""
   print '>', ' '.join(map(pipes.quote, command))
   sys.stdout.flush()
   if TESTING:
     class MockPopen(object):
       @staticmethod
@@ skipping 58 matching lines @@
   args = ['--verbose']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   for suite in suites:
     buildbot_report.PrintNamedStep(suite)
     RunCmd(['build/android/run_tests.py', '-s', suite] + args)
 
 
+def RunChromeDriverTests():
+  """Run all the steps for running chromedriver tests.

[Isaac (away), 2013/03/04 22:35:13]

move triple code to line 142 (all on one line)

[frankf, 2013/03/04 23:18:11]

Done.

+
+  """
+  buildbot_report.PrintNamedStep('chromedriver')

[Isaac (away), 2013/03/04 22:35:13]

would 'chromedriver_tests' be more descriptive? 

[frankf, 2013/03/04 23:18:11]

This is very close to the name of one of the steps in that script. Renamed to
'chromedriver_annotation'

On 2013/03/04 22:35:13, Isaac wrote:

+  RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
+          '--android-package=%s' % constants.CHROMIUM_TEST_SHELL_PACKAGE])
+
+
 def InstallApk(options, test, print_step=False):
   """Install an apk to all phones.
 
   Args:
     options: options object
     test: An I_TEST namedtuple
     print_step: Print a buildbot step
   """
   if print_step:
     buildbot_report.PrintNamedStep('install_%s' % test.name.lower())
@@ skipping 87 matching lines @@
     RebootDevices()
 
   # Device check and alert emails
   buildbot_report.PrintNamedStep('device_status_check')
   RunCmd(['build/android/device_status_check.py'], flunk_on_failure=False)
 
   if options.install:
     test_obj = INSTRUMENTATION_TESTS[options.install]
     InstallApk(options, test_obj, print_step=True)
 
+  if 'chromedriver' in options.test_filter:
+    RunChromeDriverTests()
   if 'unit' in options.test_filter:
     RunTestSuites(options, gtest_config.STABLE_TEST_SUITES)
   if 'ui' in options.test_filter:
     for test in INSTRUMENTATION_TESTS.itervalues():
       RunInstrumentationSuite(options, test)
   if 'webkit' in options.test_filter:
     RunTestSuites(options, ['webkit_unit_tests', 'TestWebKitAPI'])
     RunWebkitLint(options.target)
   if 'webkit_layout' in options.test_filter:
     RunWebkitLayoutTests(options)
@@ skipping 66 matching lines @@
       'slave', 'android'))
   if os.path.exists(build_internal_android):
     android_paths.insert(0, build_internal_android)
   os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']])
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))