aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/recipe_modules/flavor
diff options
context:
space:
mode:
authorGravatar Kevin Lubick <kjlubick@google.com>2017-02-13 10:35:39 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-13 16:20:06 +0000
commite4fd9d0463b219170d5d6507955906825fbf8fc6 (patch)
treee457df47464463ed8a7456bf83470ccd360fd8f7 /infra/bots/recipe_modules/flavor
parent267be7fbc38174652c750ec69d8dc1feaa72db0c (diff)
Clean up hack of run api
Also fix such that the Nexus Players get kicked three times not one and a half times. BUG=skia:6045 Change-Id: Ie9142f809a979a46b17a8ad9a205279d6fcb9bd5 Reviewed-on: https://skia-review.googlesource.com/8266 Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/flavor')
-rw-r--r--infra/bots/recipe_modules/flavor/gn_android_flavor.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
index 3c77e849d7..a994f74bcc 100644
--- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
@@ -53,10 +53,9 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
import time
kicks = 0
- while kicks < 2:
+ while True:
times = 0
-
while times < 30:
print 'Waiting for the device to be connected and ready.'
try:
@@ -70,6 +69,8 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
# no device connected/authorized yet
pass
time.sleep(5)
+ if kicks >= 3:
+ break
print 'Giving the device a "kick" by trying to reboot it.'
kicks += 1
print subprocess.check_output(['adb', 'reboot'])