UAV-develop/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-09-26 04:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

mavsdk_tests: move config into json file

Browse Source
This commit is contained in:
Julian Oes
2020-03-05 11:18:43 +01:00
committed by Nuno Marques
parent 44a556717d
commit b4916fdecb
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/mavsdk_tests/configs/sitl.json Normal file
View File

@@ -0,0 +1,23 @@
[
{
"model": "iris",
"test_filter": "[multicopter]",
"timeout_min": 20
},
{
"model": "iris_opt_flow_mockup",
"test_filter": "[multicopter_offboard]",
"timeout_min": 20
},
{
"model": "iris_vision",
"test_filter": "[multicopter_offboard]",
"timeout_min": 20,
"max_speed_factor": 1
},
{
"model": "standard_vtol",
"test_filter": "[vtol]",
"timeout_min": 20
}
]

30
test/mavsdk_tests/mavsdk_test_runner.py
View File

@@ -4,6 +4,7 @@ import argparse
import atexit import atexit
import datetime import datetime
import errno import errno
import json
import os import os
import psutil import psutil
import subprocess import subprocess
@@ -11,31 +12,6 @@ import sys
import signal import signal
test_matrix = [
{
"model": "iris",
"test_filter": "[multicopter]",
"timeout_min": 20,
},
{
"model": "iris_opt_flow_mockup",
"test_filter": "[multicopter_offboard]",
"timeout_min": 20,
},
{
"model": "iris_vision",
"test_filter": "[multicopter_offboard]",
"timeout_min": 20,
"max_speed_factor": 1,
},
{
"model": "standard_vtol",
"test_filter": "[vtol]",
"timeout_min": 20,
},
]
class Runner: class Runner:
def __init__(self, log_dir): def __init__(self, log_dir):
self.cmd = "" self.cmd = ""
@@ -202,6 +178,7 @@ def main():
help="Specify which model to run") help="Specify which model to run")
parser.add_argument("--debugger", default="", parser.add_argument("--debugger", default="",
help="valgrind callgrind gdb lldb") help="valgrind callgrind gdb lldb")
parser.add_argument("config_file", help="JSON config file to use")
args = parser.parse_args() args = parser.parse_args()
if not is_everything_ready(): if not is_everything_ready():
@@ -281,6 +258,9 @@ def run(args):
def run_test_group(args): def run_test_group(args):
overall_success = True overall_success = True
with open(args.config_file) as json_file:
test_matrix = json.load(json_file)
if args.model == 'all': if args.model == 'all':
models = test_matrix models = test_matrix
else: else: