From 3be6a439f181c434df663476c305637495e5b5a6 Mon Sep 17 00:00:00 2001 From: Anthony Lamping Date: Tue, 27 Feb 2018 23:30:57 -0500 Subject: [PATCH] CI: better detect end of mission if the vehicle doesn't land and disarm at the end of the mission, the current sequence doesn't reset to 0 --- integrationtests/python_src/px4_it/mavros/mission_test.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/integrationtests/python_src/px4_it/mavros/mission_test.py b/integrationtests/python_src/px4_it/mavros/mission_test.py index a3d33fd85f..8f8c3d904c 100755 --- a/integrationtests/python_src/px4_it/mavros/mission_test.py +++ b/integrationtests/python_src/px4_it/mavros/mission_test.py @@ -197,11 +197,9 @@ class MavrosMissionTest(MavrosTestCommon): reached = ( # advanced to next wp (index < self.mission_wp.current_seq) - # end of mission, reset to first wp - or (mission_length > 1 and index == (mission_length - 1) - and self.mission_wp.current_seq == 0) - # end of mission with only 1 wp - or (mission_length == 1 and self.mission_item_reached == 0)) + # end of mission + or (index == (mission_length - 1) + and self.mission_item_reached == index)) if reached: rospy.loginfo(