From f3866e5f39158ae2ea0238a133772642264d24bb Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Mon, 7 Sep 2020 15:17:41 +1000
Subject: [PATCH] autotest: disable button test

---
 Tools/autotest/arducopter.py | 1 +
 Tools/autotest/arduplane.py  | 5 +++++
 Tools/autotest/common.py     | 2 +-
 Tools/autotest/rover.py      | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
index ad631d3542..26049f5aab 100644
--- a/Tools/autotest/arducopter.py
+++ b/Tools/autotest/arducopter.py
@@ -5586,6 +5586,7 @@ class AutoTestCopter(AutoTest):
             "Parachute": "See https://github.com/ArduPilot/ardupilot/issues/4702",
             "HorizontalAvoidFence": "See https://github.com/ArduPilot/ardupilot/issues/11525",
             "AltEstimation": "See https://github.com/ArduPilot/ardupilot/issues/15191",
+            "Button": "See https://github.com/ArduPilot/ardupilot/issues/15259",
         }
 
 class AutoTestHeli(AutoTestCopter):
diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py
index 646f1658f5..9e6104d1b5 100644
--- a/Tools/autotest/arduplane.py
+++ b/Tools/autotest/arduplane.py
@@ -2114,3 +2114,8 @@ class AutoTestPlane(AutoTest):
              self.log_upload),
         ])
         return ret
+
+    def disabled_tests(self):
+        return {
+            "Button": "See https://github.com/ArduPilot/ardupilot/issues/15259",
+        }
diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index 9548eae02d..e1e68fccb2 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -6669,7 +6669,7 @@ switch value'''
         # but it *will* end up as 1<<btn immediately afterwards.  Thus
         # not attempting to fetch the value back here:
         new_mask = 0
-        self.send_set_parameter("SIM_PIN_MASK", new_mask)
+        self.send_set_parameter("SIM_PIN_MASK", new_mask, verbose=True)
         tstart = self.get_sim_time_cached()
         while True:
             now = self.get_sim_time_cached()
diff --git a/Tools/autotest/rover.py b/Tools/autotest/rover.py
index 8ef5990473..52d5bdfa66 100644
--- a/Tools/autotest/rover.py
+++ b/Tools/autotest/rover.py
@@ -5455,6 +5455,7 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm)
     def disabled_tests(self):
         return {
             "DriveMaxRCIN": "currently triggers Arithmetic Exception",
+            "Button": "See https://github.com/ArduPilot/ardupilot/issues/15259",
         }
 
     def rc_defaults(self):