Move android reboot step into python

build/android/buildbot/bb_tests.py

Index: build/android/buildbot/bb_tests.py
diff --git a/build/android/buildbot/bb_tests.py b/build/android/buildbot/bb_tests.py
deleted file mode 100755
index 094d6fb8ef1502c2604e2b826478fb645484a67e..0000000000000000000000000000000000000000
--- a/build/android/buildbot/bb_tests.py
+++ /dev/null
@@ -1,258 +0,0 @@
-#!/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
-import pipes
-import shutil
-import subprocess
-import sys
-
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-from pylib import buildbot_report
-from pylib import constants
-from pylib.gtest import gtest_config
-
-
-TESTING = 'BUILDBOT_TESTING' in os.environ
-
-CHROME_SRC = constants.CHROME_DIR
-
-# Describes an instrumation test suite:
-#   test: Name of test we're running.
-#   apk: apk to be installed.
-#   apk_package: package for the apk to be installed.
-#   test_apk: apk to run tests on.
-#   test_data: data folder in format destination:source.
-I_TEST = collections.namedtuple('InstrumentationTest', [
-    'name', 'apk', 'apk_package', 'test_apk', 'test_data'])
-
-INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
-    I_TEST('ContentShell',
-           'ContentShell.apk',
-           'org.chromium.content_shell',
-           'ContentShellTest',
-           'content:content/test/data/android/device_files'),
-    I_TEST('ChromiumTestShell',
-           'ChromiumTestShell.apk',
-           'org.chromium.chrome.testshell',
-           'ChromiumTestShellTest',
-           'chrome:chrome/test/data/android/device_files'),
-    I_TEST('AndroidWebView',
-           'AndroidWebView.apk',
-           'org.chromium.android_webview',
-           'AndroidWebViewTest',
-           'webview:android_webview/test/data/device_files'),
-    ])
-
-VALID_TESTS = set(['ui', 'unit', 'webkit', 'webkit_layout'])
-
-
-def SpawnCmd(command):
-  """Spawn a process without waiting for termination."""
-  # Add adb binary to path. In the future, might use build_internal copy.
-  env = dict(os.environ)
-  env['PATH'] = os.pathsep.join([
-      env['PATH'], os.path.join(constants.ANDROID_SDK_ROOT, 'platform-tools')])
-  print '>', ' '.join(map(pipes.quote, command))
-  sys.stdout.flush()
-  if TESTING:
-    class MockPopen(object):
-      @staticmethod
-      def wait():
-        return 0
-    return MockPopen()
-
-  return subprocess.Popen(command, cwd=CHROME_SRC, env=env)
-
-def RunCmd(command, flunk_on_failure=True):
-  """Run a command relative to the chrome source root."""
-  code = SpawnCmd(command).wait()
-  print '<', ' '.join(map(pipes.quote, command))
-  if code != 0:
-    print 'ERROR: non-zero status %d from %s' % (code, command)
-    if flunk_on_failure:
-      buildbot_report.PrintError()
-    else:
-      buildbot_report.PrintWarning()
-  return code
-
-
-def RunTestSuites(options, suites):
-  """Manages an invocation of run_tests.py.
-
-  Args:
-    options: options object.
-    suites: List of suites to run.
-  """
-  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 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(options, test)
-  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)
-
-
-def RunWebkitLint(target):
-  """Lint WebKit's TestExpectation files."""
-  buildbot_report.PrintNamedStep('webkit_lint')
-  RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py',
-          '--lint-test-files',
-          '--chromium',
-          '--target', target])
-
-
-def RunWebkitLayoutTests(options):
-  """Run layout tests on an actual device."""
-  buildbot_report.PrintNamedStep('webkit_tests')
-  RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py',
-          '--no-show-results',
-          '--no-new-test-results',
-          '--full-results-html',
-          '--clobber-old-results',
-          '--exit-after-n-failures', '5000',
-          '--exit-after-n-crashes-or-timeouts', '100',
-          '--debug-rwt-logging',
-          '--results-directory', '..layout-test-results',
-          '--target', options.target,
-          '--builder-name', options.build_properties.get('buildername', ''),
-          '--build-number', options.build_properties.get('buildnumber', ''),
-          '--master-name', options.build_properties.get('mastername', ''),
-          '--build-name', options.build_properties.get('buildername', ''),
-          '--platform=chromium-android',
-          '--test-results-server',
-          options.factory_properties.get('test_results_server', '')])
-
-
-def MainTestWrapper(options):
-  # 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 not options.test_filter:
-    return
-
-  # Spawn logcat monitor
-  logcat_dir = os.path.join(CHROME_SRC, 'out/logcat')
-  shutil.rmtree(logcat_dir, ignore_errors=True)
-  SpawnCmd(['build/android/adb_logcat_monitor.py', logcat_dir])
-
-  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)
-
-  if options.experimental:
-    RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
-
-  # Print logcat, kill logcat monitor
-  buildbot_report.PrintNamedStep('logcat_dump')
-  RunCmd(['build/android/adb_logcat_printer.py', logcat_dir])
-
-  buildbot_report.PrintNamedStep('test_report')
-  for report in glob.glob(
-      os.path.join(CHROME_SRC, 'out', options.target, 'test_logs', '*.log')):
-    subprocess.Popen(['cat', report]).wait()
-    os.remove(report)
-
-
-def main(argv):
-  parser = optparse.OptionParser()
-
-  def convert_json(option, _, value, parser):
-    setattr(parser.values, option.dest, json.loads(value))
-
-  parser.add_option('--build-properties', action='callback',
-                    callback=convert_json, type='string', default={},
-                    help='build properties in JSON format')
-  parser.add_option('--factory-properties', action='callback',
-                    callback=convert_json, type='string', default={},
-                    help='factory properties in JSON format')
-  parser.add_option('--slave-properties', action='callback',
-                    callback=convert_json, type='string', default={},
-                    help='Properties set by slave script in JSON format')
-  parser.add_option('--experimental', action='store_true',
-                    help='Run experiemental tests')
-  parser.add_option('-f', '--test-filter', metavar='<filter>', default=[],
-                    action='append',
-                    help=('Run a test suite. Test suites: "%s"' %
-                          '", "'.join(VALID_TESTS)))
-  parser.add_option('--asan', action='store_true', help='Run tests with asan.')
-  parser.add_option('--install', metavar='<apk name>',
-                    help='Install an apk by name')
-  options, args = parser.parse_args(argv[1:])
-
-  def ParserError(msg):
-    """We avoid parser.error because it calls sys.exit."""
-    parser.print_help()
-    print >> sys.stderr, '\nERROR:', msg
-    return 1
-
-  if args:
-    return ParserError('Unused args %s' % args)
-
-  unknown_tests = set(options.test_filter) - VALID_TESTS
-  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))