| 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 732140c33b334efc51b423199420e6a1ca8de2bd..36563c6be25cf967f3388bb70a18a44518d68962 100644
|
| --- a/build/android/pylib/utils/test_environment.py
|
| +++ b/build/android/pylib/utils/test_environment.py
|
| @@ -45,7 +45,8 @@ def CleanupLeftoverProcesses(devices):
|
| d.RestartAdbd()
|
| d.EnableRoot()
|
| d.WaitUntilFullyBooted()
|
| - except device_errors.CommandFailedError:
|
| + except (device_errors.CommandFailedError,
|
| + device_errors.CommandTimeoutError):
|
| logging.exception('Failed to clean up device. Attempting to continue.')
|
|
|
| device_utils.DeviceUtils.parallel(devices).pMap(cleanup_device)
|
|
|