From 0788b46374bde9bc5beacd9273beacb26b56b1b3 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 11 Dec 2020 10:26:14 +1100
Subject: [PATCH] autotest: add trivial test for Callisto

---
 Tools/autotest/arducopter.py | 14 ++++++++++++++
 Tools/autotest/common.py     |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
index 28191f1182..5708b2d45f 100644
--- a/Tools/autotest/arducopter.py
+++ b/Tools/autotest/arducopter.py
@@ -5616,6 +5616,16 @@ class AutoTestCopter(AutoTest):
         print("log difference: %s" % str(log_difference))
         return log_difference[0]
 
+    def test_callisto(self):
+        self.customise_SITL_commandline([
+            "--defaults", self.model_defaults_filepath('ArduCopter', 'Callisto')
+        ],
+                                        model="octa-quad:@ROMFS/models/Callisto.json",
+                                        wipe=True,
+)
+        self.takeoff(10)
+        self.do_RTL()
+
     def test_replay(self):
         '''test replay correctness'''
         self.progress("Building Replay")
@@ -6015,6 +6025,10 @@ class AutoTestCopter(AutoTest):
              "Test DataFlash Block backend erase",
              self.test_dataflash_erase),
 
+            ("Callisto",
+             "Test Callisto",
+             self.test_callisto),
+
             ("Replay",
              "Test Replay",
              self.test_replay),
diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index 14ac801d3c..ca0176f803 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -4639,6 +4639,8 @@ Also, ignores heartbeats not from our target system'''
     def send_statustext(self, text):
         if sys.version_info.major >= 3 and not isinstance(text, bytes):
             text = bytes(text, "ascii")
+        elif type(text) == unicode:
+            text = text.encode('ascii')
         self.mav.mav.statustext_send(mavutil.mavlink.MAV_SEVERITY_WARNING, text)
 
     def get_exception_stacktrace(self, e):