LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make runtest reboot and root more robust.

Browse Source 
Add a couple sleep statements to allow time for device to go offline.

Change-Id: I3a5fffc948f6c7b67bcdec4526990a6becd2d02f
This commit is contained in:
Brett Chabot
2011-06-07 10:10:38 -07:00
parent 8207c8935b
commit cdfaae1a34
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
testrunner/adb_interface.py
View File

@@ -155,6 +155,7 @@ class AdbInterface:
return True return True
elif "restarting adbd as root" in output: elif "restarting adbd as root" in output:
# device will disappear from adb, wait for it to come back # device will disappear from adb, wait for it to come back
time.sleep(2)
self.SendCommand("wait-for-device") self.SendCommand("wait-for-device")
return True return True
else: else:

3
testrunner/runtest.py
View File

@@ -35,6 +35,7 @@ import optparse
import os import os
from sets import Set from sets import Set
import sys import sys
import time
# local imports # local imports
import adb_interface import adb_interface
@@ -388,6 +389,8 @@ class TestRunner(object):
self._adb.SendShellCommand("\"echo %s >> /data/local.prop\"" self._adb.SendShellCommand("\"echo %s >> /data/local.prop\""
% self._DALVIK_VERIFIER_OFF_PROP) % self._DALVIK_VERIFIER_OFF_PROP)
self._adb.SendCommand("reboot") self._adb.SendCommand("reboot")
# wait for device to go offline
time.sleep(10)
self._adb.SendCommand("wait-for-device", timeout_time=60, self._adb.SendCommand("wait-for-device", timeout_time=60,
retry_count=3) retry_count=3)
self._adb.EnableAdbRoot() self._adb.EnableAdbRoot()