| 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 4d88a45e6523fefbc2f4abf212553ea1339e5f18..f55a4acc100997aeb1bc5b4e7ee69caca73056d8 100644
|
| --- a/build/android/pylib/utils/test_environment.py
|
| +++ b/build/android/pylib/utils/test_environment.py
|
| @@ -34,13 +34,14 @@ def CleanupLeftoverProcesses():
|
| """Clean up the test environment, restarting fresh adb and HTTP daemons."""
|
| _KillWebServers()
|
| device_utils.RestartServer()
|
| - p = device_utils.DeviceUtils.parallel()
|
| - p.old_interface.RestartAdbdOnDevice()
|
| - try:
|
| - p.EnableRoot()
|
| - except device_errors.CommandFailedError as e:
|
| - # TODO(jbudorick) Handle this exception appropriately after interface
|
| - # conversions are finished.
|
| - logging.error(str(e))
|
| - p.WaitUntilFullyBooted()
|
| +
|
| + def cleanup_device(d):
|
| + d.RestartAdbd()
|
| + try:
|
| + d.EnableRoot()
|
| + except device_errors.CommandFailedError as e:
|
| + logging.error(str(e))
|
| + d.WaitUntilFullyBooted()
|
| +
|
| + device_utils.DeviceUtils.parallel().pMap(cleanup_device)
|
|
|
|
|