Index: build/android/pylib/utils/test_environment.py |
diff --git a/build/android/pylib/utils/test_environment.py b/build/android/pylib/utils/test_environment.py |
index 8eff0b0a24c343a56fa22a288478b490da7f52d8..fb681203c93a8b70efb82bc21da55c7838773b6a 100644 |
--- a/build/android/pylib/utils/test_environment.py |
+++ b/build/android/pylib/utils/test_environment.py |
@@ -31,11 +31,11 @@ def _KillWebServers(): |
logging.warning('Failed waiting for %s to die. %s', p.pid, e) |
- |
def CleanupLeftoverProcesses(): |
"""Clean up the test environment, restarting fresh adb and HTTP daemons.""" |
_KillWebServers() |
did_restart_host_adb = False |
+ # TODO(jbudorick) Implement this with the device parallelizer utility. |
for device_serial in android_commands.GetAttachedDevices(): |
device = device_utils.DeviceUtils(device_serial) |
# Make sure we restart the host adb server only once. |
@@ -49,5 +49,5 @@ def CleanupLeftoverProcesses(): |
# TODO(jbudorick) Handle this exception appropriately after interface |
# conversions are finished. |
logging.error(str(e)) |
- device.old_interface.WaitForDevicePm() |
+ device.WaitUntilFullyBooted() |