mirror of https://github.com/ArduPilot/ardupilot
Tools: autotest: move fetching of banner and version
Moved these to before log download. They fail randomly after log download.
This commit is contained in:
parent
2a81792b41
commit
b7a293ca5f
|
@ -293,15 +293,6 @@ def drive_APMrover2(binary, viewerip=None, use_map=False, valgrind=False, gdb=Fa
|
|||
if not disarm_rover(mavproxy, mav):
|
||||
progress("Failed to DISARM")
|
||||
failed = True
|
||||
if not log_download(mavproxy, mav, util.reltopdir("../buildlogs/APMrover2-log.bin")):
|
||||
progress("Failed log download")
|
||||
failed = True
|
||||
# if not drive_left_circuit(mavproxy, mav):
|
||||
# progress("Failed left circuit")
|
||||
# failed = True
|
||||
# if not drive_RTL(mavproxy, mav):
|
||||
# progress("Failed RTL")
|
||||
# failed = True
|
||||
|
||||
# do not move this to be the first test. MAVProxy's dedupe
|
||||
# function may bite you.
|
||||
|
@ -319,6 +310,16 @@ def drive_APMrover2(binary, viewerip=None, use_map=False, valgrind=False, gdb=Fa
|
|||
if not do_set_mode_via_command_long(mavproxy, mav):
|
||||
failed = True
|
||||
|
||||
if not log_download(mavproxy, mav, util.reltopdir("../buildlogs/APMrover2-log.bin")):
|
||||
progress("Failed log download")
|
||||
failed = True
|
||||
# if not drive_left_circuit(mavproxy, mav):
|
||||
# progress("Failed left circuit")
|
||||
# failed = True
|
||||
# if not drive_RTL(mavproxy, mav):
|
||||
# progress("Failed RTL")
|
||||
# failed = True
|
||||
|
||||
except pexpect.TIMEOUT as e:
|
||||
progress("Failed with timeout")
|
||||
failed = True
|
||||
|
|
Loading…
Reference in New Issue