From 8f9d3909f165c9f7643ac5b1f13dd78fa4ddb185 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 15 Jan 2021 17:45:10 +1100 Subject: [PATCH] autotest: model_defaults_filepath always returns a list --- Tools/autotest/arducopter.py | 4 ++-- Tools/autotest/common.py | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py index b620e66b99..cf68621e8e 100644 --- a/Tools/autotest/arducopter.py +++ b/Tools/autotest/arducopter.py @@ -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, diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index df05c6aebd..2c67b59bce 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -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