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

Autotest: fix subtests completion

Browse Source
This commit is contained in:
Pierre Kancir 2021-01-26 20:35:11 +01:00 committed by Peter Barker
parent b20604bb59
commit 2b71bf8e99
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Tools/autotest/autotest.py
View File

@ -717,10 +717,18 @@ def list_subtests():
tester_class = tester_class_map["test.%s" % vehicle] tester_class = tester_class_map["test.%s" % vehicle]
tester = tester_class("/bin/true", None) tester = tester_class("/bin/true", None)
subtests = tester.tests() subtests = tester.tests()
sorted_list = []
for subtest in subtests:
if type(subtest) is tuple:
(name, description, function) = subtest
sorted_list.append([name, description])
else:
sorted_list.append([subtest.name, subtest.description])
sorted_list.sort()
print("%s:" % vehicle) print("%s:" % vehicle)
for subtest in sorted(subtests, key=lambda x: x[0]): for subtest in sorted_list:
(name, description, function) = subtest print(" %s: %s" % (subtest[0], subtest[1]))
print(" %s: %s" % (name, description))
print("") print("")
@ -733,9 +741,16 @@ def list_subtests_for_vehicle(vehicle_type):
tester_class = tester_class_map["test.%s" % vehicle_type] tester_class = tester_class_map["test.%s" % vehicle_type]
tester = tester_class("/bin/true", None) tester = tester_class("/bin/true", None)
subtests = tester.tests() subtests = tester.tests()
for subtest in sorted(subtests, key=lambda x: x[0]): sorted_list = []
(name, _, _) = subtest for subtest in subtests:
print("%s " % name, end='') if type(subtest) is tuple:
(name, description, function) = subtest
sorted_list.append([name, description])
else:
sorted_list.append([subtest.name, subtest.description])
sorted_list.sort()
for subtest in sorted_list:
print("%s " % subtest[0], end='')
print("") # needed to clear the trailing % print("") # needed to clear the trailing %
if __name__ == "__main__": if __name__ == "__main__":