aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest: correct lookup for most recent log file

Browse Source
This commit is contained in:
Peter Barker 2020-12-18 08:48:52 +11:00 committed by Peter Barker
parent 50f9eee54c
commit 8e71e2505a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tools/autotest/common.py
View File

@ -2056,7 +2056,7 @@ class AutoTest(ABC):
def log_filepath(self, lognum): def log_filepath(self, lognum):
'''return filepath to lognum (where lognum comes from LOG_ENTRY''' '''return filepath to lognum (where lognum comes from LOG_ENTRY'''
log_list = sorted(self.log_list()) log_list = self.log_list()
return log_list[lognum-1] return log_list[lognum-1]
def assert_bytes_equal(self, bytes1, bytes2): def assert_bytes_equal(self, bytes1, bytes2):
@ -2353,7 +2353,7 @@ class AutoTest(ABC):
def log_list(self): def log_list(self):
'''return a list of log files present in POSIX-style loging dir''' '''return a list of log files present in POSIX-style loging dir'''
ret = glob.glob("logs/*.BIN") ret = sorted(glob.glob("logs/00*.BIN"))
self.progress("log list: %s" % str(ret)) self.progress("log list: %s" % str(ret))
return ret return ret
@ -6784,8 +6784,11 @@ switch value'''
return num_log return num_log
def current_onboard_log_filepath(self): def current_onboard_log_filepath(self):
'''return filepath to currently open dataflash log''' '''return filepath to currently open dataflash log. We assume that's
return os.path.join("logs/%08u.BIN" % self.last_onboard_log()) the latest log...'''
logs = self.log_list()
latest = logs[-1]
return latest
def dfreader_for_current_onboard_log(self): def dfreader_for_current_onboard_log(self):
return DFReader.DFReader_binary(self.current_onboard_log_filepath(), return DFReader.DFReader_binary(self.current_onboard_log_filepath(),