From 211cd5255da771db78bb22578c9daede40d227f2 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Mon, 30 Nov 2020 16:54:56 +1100
Subject: [PATCH] autotest: tweak beacon test to be replay-friendly

---
 Tools/autotest/arducopter.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
index 5c34ff2e80..008b3a7465 100644
--- a/Tools/autotest/arducopter.py
+++ b/Tools/autotest/arducopter.py
@@ -4967,8 +4967,8 @@ class AutoTestCopter(AutoTest):
             self.set_parameter("EK3_SRC1_VELXY", 0) # None
             self.set_parameter("EK3_SRC1_VELZ", 0)  # None
             self.set_parameter("EK2_ENABLE", 0)
-            self.reboot_sitl()
             self.set_parameter("AHRS_EKF_TYPE", 3)
+            self.reboot_sitl()
 
             # turn off GPS arming checks.  This may be considered a
             # bug that we need to do this.
@@ -5023,9 +5023,10 @@ class AutoTestCopter(AutoTest):
             self.progress("Caught exception: %s" %
                           self.get_exception_stacktrace(e))
             ex = e
-        self.context_pop()
         self.disarm_vehicle(force=True)
         self.reboot_sitl()
+        self.context_pop()
+        self.reboot_sitl()
         if ex is not None:
             raise ex