From 065d03dd30aca9c02c7a2d8292d31dbf1444fab7 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 28 Aug 2020 22:49:17 +1000
Subject: [PATCH] autotest: add a timeout in the button test

---
 Tools/autotest/common.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index cd0f6c96fb..7860fd0075 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -6483,11 +6483,14 @@ switch value'''
         # but it *will* end up as 1<<btn immediately afterwards.  Thus
         # not attempting to fetch the value back here:
         self.send_set_parameter("SIM_PIN_MASK", 0)
+        tstart = self.get_sim_time_cached()
         while True:
+            now = self.get_sim_time_cached()
+            if now - tstart > 10:
+                raise AutoTestTimeoutException("No BUTTON_CHANGE received")
             m3 = self.mav.recv_match(type='BUTTON_CHANGE', blocking=True, timeout=1)
             self.progress("m3: %s" % str(m3))
             if m3 is None:
-                self.progress("Did not get new message")
                 continue
             if m.last_change_ms == m3.last_change_ms:
                 self.progress("last_change_ms same as first message")