[chromedriver] Fixes for android tests gating chromedriver release.

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 hashlib
 import multiprocessing
 import os
@@ skipping 58 matching lines @@
       'AndroidWebViewTest',
       'webview:android_webview/test/data/device_files'),
     ])
 
 VALID_TESTS = set(['chromedriver', 'gpu', 'ui', 'unit', 'webkit',
                    'webkit_layout', 'webrtc'])
 
 RunCmd = bb_utils.RunCmd
 
 
+def _GetRevision(options):
+  """Get the SVN revision number.
+
+  Args:
+    options: options object.
+
+  Returns:
+    The revision number.
+  """
+  revision = options.build_properties.get('got_revision')
+  if not revision:
+    revision = options.build_properties.get('revision', 'testing')
+  return revision
+
+
 # multiprocessing map_async requires a top-level function for pickle library.
 def RebootDeviceSafe(device):
   """Reboot a device, wait for it to start, and squelch timeout exceptions."""
   try:
     android_commands.AndroidCommands(device).Reboot(True)
   except errors.DeviceUnresponsiveError as e:
     return e
 
 
 def RebootDevices():
@@ skipping 30 matching lines @@
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   for suite in suites:
     bb_annotations.PrintNamedStep(suite)
     cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args
     if suite == 'content_browsertests':
       cmd.append('--num_retries=1')
     RunCmd(cmd)
 
-def RunChromeDriverTests(_):
+def RunChromeDriverTests(options):
   """Run all the steps for running chromedriver tests."""
   bb_annotations.PrintNamedStep('chromedriver_annotation')
   RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
           '--android-packages=%s,%s,%s' %
            (constants.PACKAGE_INFO['chromium_test_shell'].package,
             constants.PACKAGE_INFO['chrome_stable'].package,
-            constants.PACKAGE_INFO['chrome_beta'].package)])
+            constants.PACKAGE_INFO['chrome_beta'].package),
+          '--revision=%s' % _GetRevision(options),
+          '--update_log'])
 
 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:
@@ skipping 208 matching lines @@
 
   Args:
     options: Command line options.
     gs_base_dir: The Google Storage base directory (e.g.
       'chromium-code-coverage/java')
     dir_to_upload: Absolute path to the directory to be uploaded.
     link_text: Link text to be displayed on the step.
     link_rel_path: Link path relative to |dir_to_upload|.
     gs_url: Google storage URL.
   """
-  revision = options.build_properties.get('got_revision')
-  if not revision:
-    revision = options.build_properties.get('revision', 'testing')
+  revision = _GetRevision(options)
   bot_id = options.build_properties.get('buildername', 'testing')
   randhash = hashlib.sha1(str(random.random())).hexdigest()
   gs_path = '%s/%s/%s/%s' % (gs_base_dir, bot_id, revision, randhash)
   RunCmd([bb_utils.GSUTIL_PATH, 'cp', '-R', dir_to_upload, 'gs://%s' % gs_path])
   bb_annotations.PrintLink(link_text,
       '%s/%s/%s' % (gs_url, gs_path, link_rel_path))
 
 
 def GenerateJavaCoverageReport(options):
   """Generates an HTML coverage report using EMMA and uploads it."""
@@ skipping 105 matching lines @@
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))