Fix PRESUBMIT.py for build/android/buildbot

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 80 matching lines @@
   """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():
   """Reboot all attached and online devices."""
   buildbot_report.PrintNamedStep('Reboot devices')
+  # Early return here to avoid presubmit dependence on adb,
+  # which might not exist in this checkout.
+  if TESTING:
+    return
   devices = android_commands.GetAttachedDevices()
   print 'Rebooting: %s' % devices
-  if devices and not TESTING:
+  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):
       buildbot_report.PrintWarning()
     else:
@@ skipping 187 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))