From cc1b75ad298b880fa69e76ac3b3372b8fea2c44b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 9 May 2014 09:50:14 +1000 Subject: [PATCH] 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) --- Tools/autotest/common.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index 88d72bf887..e4d56e6c25 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -250,14 +250,7 @@ def log_download(mavproxy, mav, filename, timeout=360): mav.wait_heartbeat() mav.wait_heartbeat() mavproxy.send("log download latest %s\n" % filename) - t1 = time.time() - while time.time() - t1 < timeout: - try: - mavproxy.expect("Finished downloading", timeout=5) - except Exception: - mavproxy.send("log status\n") - continue - break + mavproxy.expect("Finished downloading", timeout=timeout) mavproxy.send("log erase\n") mav.wait_heartbeat() mav.wait_heartbeat()