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 145e07c85efa4a4674f2b3acf23972cb15f628c1..8eff0b0a24c343a56fa22a288478b490da7f52d8 100644 |
--- a/build/android/pylib/utils/test_environment.py |
+++ b/build/android/pylib/utils/test_environment.py |
@@ -7,8 +7,10 @@ import psutil |
import signal |
from pylib import android_commands |
+from pylib.device import device_errors |
from pylib.device import device_utils |
+ |
def _KillWebServers(): |
for s in [signal.SIGTERM, signal.SIGINT, signal.SIGQUIT, signal.SIGKILL]: |
signalled = [] |
@@ -41,6 +43,11 @@ def CleanupLeftoverProcesses(): |
device_utils.RestartServer() |
did_restart_host_adb = True |
device.old_interface.RestartAdbdOnDevice() |
- device.old_interface.EnableAdbRoot() |
+ try: |
+ device.EnableRoot() |
+ except device_errors.CommandFailedError as e: |
+ # TODO(jbudorick) Handle this exception appropriately after interface |
+ # conversions are finished. |
+ logging.error(str(e)) |
device.old_interface.WaitForDevicePm() |