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

autotest: stop passing defaults in via --defaults to custom_sitl_commandline

Browse Source
This commit is contained in:
Peter Barker 2024-04-18 11:12:37 +10:00 committed by Peter Barker
parent ca4fd52b95
commit 5ba8755802
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/autotest/arducopter.py
View File

@ -7652,7 +7652,8 @@ class AutoTestCopter(vehicle_test_suite.TestSuite):
ex = None ex = None
try: try:
self.customise_SITL_commandline( self.customise_SITL_commandline(
["--defaults", ','.join(self.model_defaults_filepath('Callisto'))], [],
defaults_filepath=self.model_defaults_filepath('Callisto'),
model="octa-quad:@ROMFS/models/Callisto.json", model="octa-quad:@ROMFS/models/Callisto.json",
wipe=True, wipe=True,
) )
@ -8847,7 +8848,8 @@ class AutoTestCopter(vehicle_test_suite.TestSuite):
def Callisto(self): def Callisto(self):
'''Test Callisto''' '''Test Callisto'''
self.customise_SITL_commandline( self.customise_SITL_commandline(
["--defaults", ','.join(self.model_defaults_filepath('Callisto')), ], [],
defaults_filepath=self.model_defaults_filepath('Callisto'),
model="octa-quad:@ROMFS/models/Callisto.json", model="octa-quad:@ROMFS/models/Callisto.json",
wipe=True, wipe=True,
) )

3
Tools/autotest/arduplane.py
View File

@ -3917,7 +3917,8 @@ class AutoTestPlane(vehicle_test_suite.TestSuite):
if not isinstance(defaults, list): if not isinstance(defaults, list):
defaults = [defaults] defaults = [defaults]
self.customise_SITL_commandline( self.customise_SITL_commandline(
["--defaults", ','.join(defaults), ], [],
defaults_filepath=defaults,
model=model, model=model,
wipe=True, wipe=True,
) )

6
Tools/autotest/helicopter.py
View File

@ -199,7 +199,8 @@ class AutoTestHelicopter(AutoTestCopter):
if not isinstance(defaults, list): if not isinstance(defaults, list):
defaults = [defaults] defaults = [defaults]
self.customise_SITL_commandline( self.customise_SITL_commandline(
["--defaults", ','.join(defaults), ], [],
defaults_filepath=defaults,
model=model, model=model,
wipe=True, wipe=True,
) )
@ -210,7 +211,8 @@ class AutoTestHelicopter(AutoTestCopter):
def governortest(self): def governortest(self):
'''Test Heli Internal Throttle Curve and Governor''' '''Test Heli Internal Throttle Curve and Governor'''
self.customise_SITL_commandline( self.customise_SITL_commandline(
["--defaults", ','.join(self.model_defaults_filepath('heli-gas')), ], [],
defaults_filepath=self.model_defaults_filepath('heli-gas'),
model="heli-gas", model="heli-gas",
wipe=True, wipe=True,
) )

3
Tools/autotest/pysim/util.py
View File

@ -542,6 +542,9 @@ def start_SITL(binary,
cmd.extend(customisations) cmd.extend(customisations)
if "--defaults" in customisations:
raise ValueError("--defaults must be passed in via defaults_filepath keyword argument, not as part of customisation list") # noqa
pexpect_logfile_prefix = stdout_prefix pexpect_logfile_prefix = stdout_prefix
if pexpect_logfile_prefix is None: if pexpect_logfile_prefix is None:
pexpect_logfile_prefix = os.path.basename(binary) pexpect_logfile_prefix = os.path.basename(binary)