Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: model_defaults_filepath always returns a list

Browse Source
This commit is contained in:
Peter Barker 2021-01-15 17:45:10 +11:00 committed by Andrew Tridgell
parent d9dbcb17c4
commit 8f9d3909f1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/autotest/arducopter.py
View File

@ -5152,7 +5152,7 @@ class AutoTestCopter(AutoTest):
ex = None
try:
self.customise_SITL_commandline([
"--defaults", self.model_defaults_filepath('ArduCopter', 'Callisto')
"--defaults", ','.join(self.model_defaults_filepath('ArduCopter', 'Callisto'))
],
model="octa-quad:@ROMFS/models/Callisto.json",
wipe=True,
@ -5837,7 +5837,7 @@ class AutoTestCopter(AutoTest):
def test_callisto(self):
self.customise_SITL_commandline([
"--defaults", self.model_defaults_filepath('ArduCopter', 'Callisto')
"--defaults", ','.join(self.model_defaults_filepath('ArduCopter', 'Callisto'))
],
model="octa-quad:@ROMFS/models/Callisto.json",
wipe=True,

8
Tools/autotest/common.py
View File

@ -1298,10 +1298,8 @@ class AutoTest(ABC):
# setup test parameters
vinfo = vehicleinfo.VehicleInfo()
if self.params is None:
frames = vinfo.options[self.vehicleinfo_key()]["frames"]
self.params = frames[self.frame]["default_params_filename"]
if not isinstance(self.params, list):
self.params = [self.params]
self.params = self.model_defaults_filepath(self.vehicleinfo_key(),
self.frame)
for x in self.params:
self.repeatedly_apply_parameter_file(os.path.join(testdir, x))
self.set_parameter('LOG_DISARMED', 1)
@ -9161,4 +9159,4 @@ switch value'''
defaults_list = []
for d in defaults_filepath:
defaults_list.append(os.path.join(testdir, d))
return ','.join(defaults_list)
return defaults_list