From 68769e24c1d93707b386740d49d46fc1bfd2b556 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 26 Apr 2019 15:10:11 +1000 Subject: [PATCH] Tools: autotest: add timeout for problematic spline test --- Tools/autotest/arducopter.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py index e1ddd98000..164cd0dab3 100644 --- a/Tools/autotest/arducopter.py +++ b/Tools/autotest/arducopter.py @@ -3460,7 +3460,14 @@ class AutoTestHeli(AutoTestCopter): self.wait_seconds(20) self.change_mode("AUTO") self.set_rc(3, 1500) - self.mav.motors_disarmed_wait() + tstart = self.get_sim_time() + while True: + if not self.armed(): + break + remaining = self.get_sim_time() - tstart + if remaining <= 0: + raise AutoTestTimeoutException("Vehicle did not disarm after mission") + self.delay_sim_time(1) self.progress("Lowering rotor speed") self.set_rc(8, 1000)