fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-23 05:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

mavsdk_tests: add combined log

Browse Source
This commit is contained in:
Julian Oes
2020-03-18 17:57:41 +00:00
committed by Nuno Marques
parent 814d79cb32
commit b1ceef5b93
2 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/mavsdk_tests/process_helper.py
+3 -13
View File
@@ -32,9 +32,8 @@ class Runner:
self.log_dir = log_dir
self.log_filename = ""
def set_log_filename(self) -> None:
self.log_filename = self.log_dir + os.path.sep + \
"log-{}.log".format(self.name)
def set_log_filename(self, log_filename: str) -> None:
self.log_filename = log_filename
def get_log_filename(self) -> str:
return self.log_filename
@@ -45,7 +44,6 @@ class Runner:
atexit.register(self.stop)
self.set_log_filename()
if self.verbose:
print("Logging to {}".format(self.log_filename))
self.log_fd = open(self.log_filename, 'w')
@@ -88,18 +86,10 @@ class Runner:
def get_output(self) -> Optional[str]:
try:
output = self.output_queue.get(block=True, timeout=0.1)
return maybe_strip_color(output)
return self.output_queue.get(block=True, timeout=0.1)
except queue.Empty:
return None
def print_output(self) -> None:
output = self.get_output()
if not output:
return
print(colorize("[" + self.name.ljust(11) + "] " + output, color.RESET),
end="")
def stop(self) -> int:
atexit.unregister(self.stop)