From e2fb3aabe3e62d7f2213713eb6580ceedfc9b8e1 Mon Sep 17 00:00:00 2001 From: Chase Qi Date: Fri, 13 Nov 2015 16:07:58 +0800 Subject: android: cts: optimize adb device check * Print adb device after it is online. * Increase adb_ping timeout to 10 seconds to adapte to slow environment. Change-Id: Ie6ff14c5d8cfed50143f023b824f83154fc15789 Signed-off-by: Chase Qi --- android/cts-host.yaml | 2 +- android/scripts/cts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'android') diff --git a/android/cts-host.yaml b/android/cts-host.yaml index 09ce457..ab3af5e 100644 --- a/android/cts-host.yaml +++ b/android/cts-host.yaml @@ -53,8 +53,8 @@ run: - echo $CTS_URL - echo $IPADDR - echo $TEST_PARAMS - - adb devices - adb -s $IPADDR wait-for-device + - adb devices - ./android/scripts/cts.py $CTS_URL $IPADDR $TEST_PARAMS - echo "processes running" - ps diff --git a/android/scripts/cts.py b/android/scripts/cts.py index c5e9633..a8c65b9 100755 --- a/android/scripts/cts.py +++ b/android/scripts/cts.py @@ -80,7 +80,7 @@ class Heartbeat(threading.Thread): def run(self): while 1: if self._finished.isSet(): return - return_code = self.adb_ping.run(timeout=1) + return_code = self.adb_ping.run(timeout=10) if return_code != 0: # terminate the test as adb connection is lost print "terminating CTS for %s" % self.serial -- cgit v1.2.3