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

autotest: split Copter proximity avoidance test in two

Browse Source
This commit is contained in:
Peter Barker 2023-07-15 11:49:43 +10:00 committed by Peter Barker
parent 0c67f20a74
commit 9c0adaf1cf
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tools/autotest/arducopter.py
View File

@ -6797,8 +6797,8 @@ class AutoTestCopter(AutoTest):
self.context_pop() self.context_pop()
self.reboot_sitl() self.reboot_sitl()
def fly_proximity_avoidance_test_corners(self): def AC_Avoidance_Proximity(self):
self.start_subtest("Corners") '''Test proximity avoidance slide behaviour'''
self.context_push() self.context_push()
ex = None ex = None
try: try:
@ -6904,8 +6904,8 @@ class AutoTestCopter(AutoTest):
"Distance too great (%s) (want=%s != got=%s)" % "Distance too great (%s) (want=%s != got=%s)" %
(name, wants, gots)) (name, wants, gots))
def fly_proximity_avoidance_test_alt_no_avoid(self): def AC_Avoidance_Proximity_AVOID_ALT_MIN(self):
self.start_subtest("Alt-no-avoid") '''Test proximity avoidance with AVOID_ALT_MIN'''
self.context_push() self.context_push()
ex = None ex = None
try: try:
@ -6983,11 +6983,6 @@ class AutoTestCopter(AutoTest):
if ex is not None: if ex is not None:
raise ex raise ex
def AC_Avoidance_Proximity(self):
'''Test proximity avoidance slide behaviour'''
self.fly_proximity_avoidance_test_alt_no_avoid()
self.fly_proximity_avoidance_test_corners()
def AC_Avoidance_Fence(self): def AC_Avoidance_Fence(self):
'''Test fence avoidance slide behaviour''' '''Test fence avoidance slide behaviour'''
self.context_push() self.context_push()
@ -9683,6 +9678,7 @@ class AutoTestCopter(AutoTest):
self.StabilityPatch, self.StabilityPatch,
self.OBSTACLE_DISTANCE_3D, self.OBSTACLE_DISTANCE_3D,
self.AC_Avoidance_Proximity, self.AC_Avoidance_Proximity,
self.AC_Avoidance_Proximity_AVOID_ALT_MIN,
self.AC_Avoidance_Fence, self.AC_Avoidance_Fence,
self.AC_Avoidance_Beacon, self.AC_Avoidance_Beacon,
self.BaroWindCorrection, self.BaroWindCorrection,