Make runtest reboot and root more robust.
Add a couple sleep statements to allow time for device to go offline.
Change-Id: I3a5fffc948f6c7b67bcdec4526990a6becd2d02f
diff --git a/testrunner/adb_interface.py b/testrunner/adb_interface.py
index 3bd4396..feb1c89 100755
--- a/testrunner/adb_interface.py
+++ b/testrunner/adb_interface.py
@@ -155,6 +155,7 @@
return True
elif "restarting adbd as root" in output:
# device will disappear from adb, wait for it to come back
+ time.sleep(2)
self.SendCommand("wait-for-device")
return True
else:
diff --git a/testrunner/runtest.py b/testrunner/runtest.py
index 3ecc77b..d80bfe6 100755
--- a/testrunner/runtest.py
+++ b/testrunner/runtest.py
@@ -35,6 +35,7 @@
import os
from sets import Set
import sys
+import time
# local imports
import adb_interface
@@ -388,6 +389,8 @@
self._adb.SendShellCommand("\"echo %s >> /data/local.prop\""
% self._DALVIK_VERIFIER_OFF_PROP)
self._adb.SendCommand("reboot")
+ # wait for device to go offline
+ time.sleep(10)
self._adb.SendCommand("wait-for-device", timeout_time=60,
retry_count=3)
self._adb.EnableAdbRoot()