Add android buildbot step for apk install

build/android/buildbot/bb_tests.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 optparse
 import os
@@ skipping 75 matching lines @@
   args = ['--verbose']
   if suite:
     args.extend(['-s', suite])
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   RunCmd(['build/android/run_tests.py'] + args)
 
 
-def InstallApk(apk, apk_package, target):
-  args = ['--apk', apk, '--apk_package', apk_package]
-  if target == 'Release':
+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())
+  args = ['--apk', test.apk, '--apk_package', test.apk_package]
+  if options.target == 'Release':
     args.append('--release')
 
   RunCmd(['build/android/adb_install_apk.py'] + args)
 
 
 def RunInstrumentationSuite(options, test):
   """Manages an invocation of run_instrumentaiton_tests.py.
 
   Args:
     options: options object
     test: An I_TEST namedtuple
   """
   buildbot_report.PrintNamedStep('%s_instrumentation_tests' % test.name.lower())
 
-  InstallApk(test.apk, test.apk_package, options.target)
+  InstallApk(options, test)

[boliu, 2013/01/09 21:13:42]

from your cl description, wouldn't you want to set print_step to true?

[Isaac (away), 2013/01/09 21:17:31]

No, here it is installed as part of the instrumentation_tests step on lne 120.

The issue was line 170 where there was no specific step created before the call.
 It only affects perf bots because they're the only ones who use line 170.  See 
http://build.chromium.org/p/chromium.perf/builders/Android%20Nexus10/builds/1...

[boliu, 2013/01/09 21:20:58]

Oh oops, missed line 170.

   args = ['--test-apk', test.test_apk, '--test_data', test.test_data, '-vvv',
           '-I']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
 
   RunCmd(['build/android/run_instrumentation_tests.py'] + args)
 
 
@@ skipping 27 matching lines @@
           '--test-results-server',
           options.factory_properties.get('test_results_server', '')])
 
 
 def MainTestWrapper(options):
   # Device check and alert emails
   RunCmd(['build/android/device_status_check.py'], flunk_on_failure=False)
 
   if options.install:
     test_obj = INSTRUMENTATION_TESTS[options.install]
-    InstallApk(test_obj.apk, test_obj.apk_package, options.target)
+    InstallApk(options, test_obj, print_step=True)
 
   if not options.test_filter:
     return
 
   # Spawn logcat monitor
   logcat_dir = os.path.join(CHROME_SRC, 'out/logcat')
   shutil.rmtree(logcat_dir, ignore_errors=True)
   if not TESTING:
     subprocess.Popen(
         ['build/android/adb_logcat_monitor.py', logcat_dir], cwd=CHROME_SRC)
@@ skipping 63 matching lines @@
   if unknown_tests:
     return ParserError('Unknown tests %s' % list(unknown_tests))
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))