From b69a75098f662c22031c68c443354438d895ba32 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 22 Jul 2022 23:26:52 +1000
Subject: [PATCH] autotest: avoid draining mav while waiting for motors-armed
 heartbeat

---
 Tools/autotest/common.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index 9c1913c6fd..c1a84e580b 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -4475,7 +4475,6 @@ class AutoTest(ABC):
     def arm_vehicle(self, timeout=20, force=False):
         """Arm vehicle with mavlink arm message."""
         self.progress("Arm motors with MAVLink cmd")
-        self.drain_mav()
         p2 = 0
         if force:
             p2 = 2989
@@ -4502,7 +4501,7 @@ class AutoTest(ABC):
     def wait_armed(self, timeout=20):
         tstart = self.get_sim_time()
         while self.get_sim_time_cached() - tstart < timeout:
-            self.wait_heartbeat()
+            self.wait_heartbeat(drain_mav=False)
             if self.mav.motors_armed():
                 self.progress("Motors ARMED")
                 return