Add option to wipe device.

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 json
-import multiprocessing
 import os
 import random
 import re
 import shutil
 import sys
 
 import bb_utils
 import bb_annotations
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import provision_devices
 from pylib import android_commands
 from pylib import constants
 from pylib.device import device_utils
 from pylib.gtest import gtest_config
 
 CHROME_SRC_DIR = bb_utils.CHROME_SRC
 DIR_BUILD_ROOT = os.path.dirname(CHROME_SRC_DIR)
 CHROME_OUT_DIR = bb_utils.CHROME_OUT_DIR
-sys.path.append(os.path.join(
-    CHROME_SRC_DIR, 'third_party', 'android_testrunner'))
-import errors
-
 
 SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave')
 LOGCAT_DIR = os.path.join(bb_utils.CHROME_OUT_DIR, 'logcat')
 GS_URL = 'https://storage.googleapis.com'
 GS_AUTH_URL = 'https://storage.cloud.google.com'
 
 # 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.
@@ skipping 50 matching lines @@
 
   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:
-    device_utils.DeviceUtils(device).old_interface.Reboot(True)
-  except errors.DeviceUnresponsiveError as e:
-    return e
-
-
-def RebootDevices():
-  """Reboot all attached and online devices."""
-  # Early return here to avoid presubmit dependence on adb,
-  # which might not exist in this checkout.
-  if bb_utils.TESTING:
-    return
-  devices = android_commands.GetAttachedDevices()
-  print 'Rebooting: %s' % devices
-  if devices:
-    pool = multiprocessing.Pool(len(devices))
-    results = pool.map_async(RebootDeviceSafe, devices).get(99999)
-
-    for device, result in zip(devices, results):
-      if result:
-        print '%s failed to startup.' % device
-
-    if any(results):
-      bb_annotations.PrintWarning()
-    else:
-      print 'Reboots complete.'
-
-
 def RunTestSuites(options, suites):
   """Manages an invocation of test_runner.py for gtests.
 
   Args:
     options: options object.
     suites: List of suite names to run.
   """
   args = ['--verbose']
   if options.target == 'Release':
     args.append('--release')
@@ skipping 266 matching lines @@
   RunCmd(['sleep', '5'])
 
 
 def ProvisionDevices(options):
   bb_annotations.PrintNamedStep('provision_devices')
 
   if not bb_utils.TESTING:
     # Restart adb to work around bugs, sleep to wait for usb discovery.
     device_utils.DeviceUtils(None).old_interface.RestartAdbServer()
     RunCmd(['sleep', '1'])
-
-  if not options.no_reboot:
-    RebootDevices()
   provision_cmd = ['build/android/provision_devices.py', '-t', options.target]
   if options.auto_reconnect:
     provision_cmd.append('--auto-reconnect')
   RunCmd(provision_cmd)
 
 
 def DeviceStatusCheck(options):
   bb_annotations.PrintNamedStep('device_status_check')
   cmd = ['build/android/buildbot/bb_device_status_check.py']
   if options.restart_usb:
@@ skipping 239 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))