From 2d62fb99b1fd42535f793a4ff4539ccafea4a79e Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Mon, 18 Jan 2021 10:38:51 +1100
Subject: [PATCH] autotest: force-disarm copter before reboot in GCS failsafe
 tests

---
 Tools/autotest/arducopter.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
index 029b9be941..3537dcad0b 100644
--- a/Tools/autotest/arducopter.py
+++ b/Tools/autotest/arducopter.py
@@ -703,6 +703,7 @@ class AutoTestCopter(AutoTest):
         except Exception as ex:
             self.setGCSfailsafe(0)
             self.set_parameter('FS_OPTIONS', 0)
+            self.disarm_vehicle(force=True)
             self.reboot_sitl()
             raise ex