autotest: restore timeout in log download

this removes the debug code now that the issue has been found (it was
an old version of pymavlink causing the problem)
This commit is contained in:
Andrew Tridgell 2014-05-09 09:50:14 +10:00
parent 3f0a52cb53
commit cc1b75ad29
1 changed files with 1 additions and 8 deletions

View File

@ -250,14 +250,7 @@ def log_download(mavproxy, mav, filename, timeout=360):
mav.wait_heartbeat() mav.wait_heartbeat()
mav.wait_heartbeat() mav.wait_heartbeat()
mavproxy.send("log download latest %s\n" % filename) mavproxy.send("log download latest %s\n" % filename)
t1 = time.time() mavproxy.expect("Finished downloading", timeout=timeout)
while time.time() - t1 < timeout:
try:
mavproxy.expect("Finished downloading", timeout=5)
except Exception:
mavproxy.send("log status\n")
continue
break
mavproxy.send("log erase\n") mavproxy.send("log erase\n")
mav.wait_heartbeat() mav.wait_heartbeat()
mav.wait_heartbeat() mav.wait_heartbeat()