Bug 797697 - Reduce total wait/retry ability of waitForDevice() down …

…to something sane. r=jmaher, f=armenzg
mozilla · Oct 5, 2012 · a168e7b · a168e7b
1 parent 732face
commit a168e7b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/sut_tools/config.py b/sut_tools/config.py
@@ -62,14 +62,14 @@ def waitForDevice(waitTime=60):
     time.sleep(waitTime)
     tegraIsBack = False
     tries = 0
-    maxTries = 20
-    while tries <= maxTries:
+    maxTries = 3
+    while tries < maxTries:
         tries += 1
         print "Try %d" % tries
         if checkDeviceRoot() is not None:
             tegraIsBack = True
             break
-        time.sleep(60)
+        time.sleep(waitTime)
     if not tegraIsBack:
         print("Remote Device Error: waiting for tegra timed out.")
         sys.exit(1)

diff --git a/sut_tools/reboot.py b/sut_tools/reboot.py
@@ -25,7 +25,7 @@ def reboot(dm):
         log.info(status)
     finally:
         try:
-            waitForDevice(dm, waitTime=600)
+            waitForDevice(dm, waitTime=300)
         except SystemExit:
             clearFlag(proxyFile)
             setFlag(errorFile, "Remote Device Error: call for device reboot failed")

diff --git a/sut_tools/sut_lib.py b/sut_tools/sut_lib.py
@@ -471,8 +471,8 @@ def waitForDevice(dm, waitTime=60):
     time.sleep(waitTime)
     tegraIsBack = False
     tries       = 0
-    maxTries    = 20
-    while tries <= maxTries:
+    maxTries    = 3
+    while tries < maxTries:
         tries += 1
         log.info("Try %d" % tries)
         if dm._sock: