Index: build/android/buildbot/bb_device_steps.py |
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py |
index b68928dab9d66227045dceb0eba08ed6482dac01..51e6d5e92a5b8ca37012f800dcd9b73a041f1971 100755 |
--- a/build/android/buildbot/bb_device_steps.py |
+++ b/build/android/buildbot/bb_device_steps.py |
@@ -98,9 +98,13 @@ def RebootDeviceSafe(device): |
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) |