autotest: fixed log dump

log numbers are no longer sequential
This commit is contained in:
Andrew Tridgell 2011-11-26 19:16:56 +11:00
parent 3b33892b4a
commit 8e737ad15d

View File

@ -42,14 +42,18 @@ def dump_logs(atype):
mavproxy.expect(']') mavproxy.expect(']')
mavproxy.send("logs\n") mavproxy.send("logs\n")
mavproxy.expect("logs enabled:") mavproxy.expect("logs enabled:")
lognums = []
i = mavproxy.expect(["No logs", "(\d+) logs"]) i = mavproxy.expect(["No logs", "(\d+) logs"])
if i == 0: if i == 0:
numlogs = 0 numlogs = 0
else: else:
numlogs = int(mavproxy.match.group(1)) numlogs = int(mavproxy.match.group(1))
for i in range(numlogs):
mavproxy.expect("Log (\d+),")
lognums.append(int(mavproxy.match.group(1)))
mavproxy.expect("Log]") mavproxy.expect("Log]")
for i in range(numlogs): for i in range(numlogs):
mavproxy.send("dump %u\n" % (i+1)) mavproxy.send("dump %u\n" % lognums[i])
mavproxy.expect("logs enabled:", timeout=400) mavproxy.expect("logs enabled:", timeout=400)
mavproxy.expect("Log]") mavproxy.expect("Log]")
util.pexpect_close(mavproxy) util.pexpect_close(mavproxy)