Fix arm tests

Author: 1Blademaster

radio/app/controllers/armController.py

@@ -34,24 +34,19 @@ def arm(self, force: bool = False) -> Response:
         Returns:
             Response: The response from the arm command
         """
+        return_data = {
+            "was_disarming": False,
+            "was_force": force,
+        }
+
         if self.drone.armed:
-            return {
-                "success": False,
-                "message": "Already armed",
-                "data": {
-                    "was_disarming": False,
-                    "was_force": force,
-                },
-            }
+            return {"success": False, "message": "Already armed", "data": return_data}
 
         if not self.drone.reserve_message_type("COMMAND_ACK", self.controller_id):
             return {
                 "success": False,
                 "message": "Could not reserve COMMAND_ACK messages",
-                "data": {
-                    "was_disarming": False,
-                    "was_force": force,
-                },
+                "data": return_data,
             }
 
         try:
@@ -75,22 +70,16 @@ def arm(self, force: bool = False) -> Response:
                     time.sleep(0.05)
                 self.drone.logger.debug("ARMED")
                 return {
-                    "success": False,
+                    "success": True,
                     "message": "Armed successfully",
-                    "data": {
-                        "was_disarming": False,
-                        "was_force": force,
-                    },
+                    "data": return_data,
                 }
             else:
                 self.drone.logger.debug("Arming failed")
                 return {
                     "success": False,
                     "message": "Could not arm, command not accepted",
-                    "data": {
-                        "was_disarming": False,
-                        "was_force": force,
-                    },
+                    "data": return_data,
                 }
 
         except Exception as e:
@@ -100,10 +89,7 @@ def arm(self, force: bool = False) -> Response:
             return {
                 "success": False,
                 "message": "Could not arm, serial exception",
-                "data": {
-                    "was_disarming": False,
-                    "was_force": force,
-                },
+                "data": return_data,
             }
         finally:
             self.drone.release_message_type("COMMAND_ACK", self.controller_id)
@@ -119,24 +105,23 @@ def disarm(self, force: bool = False) -> Response:
         Returns:
             Response: The response from the disarm command
         """
+        return_data = {
+            "was_disarming": True,
+            "was_force": force,
+        }
+
         if not self.drone.armed:
             return {
                 "success": False,
                 "message": "Already disarmed",
-                "data": {
-                    "was_disarming": True,
-                    "was_force": force,
-                },
+                "data": return_data,
             }
 
         if not self.drone.reserve_message_type("COMMAND_ACK", self.controller_id):
             return {
                 "success": False,
                 "message": "Could not reserve COMMAND_ACK messages",
-                "data": {
-                    "was_disarming": True,
-                    "was_force": force,
-                },
+                "data": return_data,
             }
 
         try:
@@ -162,26 +147,24 @@ def disarm(self, force: bool = False) -> Response:
                 return {
                     "success": True,
                     "message": "Disarmed successfully",
-                    "data": {
-                        "was_disarming": True,
-                        "was_force": force,
-                    },
+                    "data": return_data,
                 }
             else:
                 self.drone.logger.debug("Could not disarm, command not accepted")
                 return {
                     "success": False,
                     "message": "Could not disarm, command not accepted",
-                    "data": {
-                        "was_disarming": True,
-                        "was_force": force,
-                    },
+                    "data": return_data,
                 }
 
         except Exception as e:
             self.drone.logger.error(e, exc_info=True)
             if self.drone.droneErrorCb:
                 self.drone.droneErrorCb(str(e))
-            return {"success": False, "message": "Could not disarm, serial exception"}
+            return {
+                "success": False,
+                "message": "Could not disarm, serial exception",
+                "data": return_data,
+            }
         finally:
             self.drone.release_message_type("COMMAND_ACK", self.controller_id)

radio/tests/helpers.py

@@ -15,9 +15,7 @@ class FakeTCP:
     """
 
     @staticmethod
-    def return_serial_exception(
-        condition=None, type=None, blocking=False, timeout=None
-    ) -> None:
+    def return_serial_exception(*args, **kwargs) -> None:
         raise SerialException(
             "Test SerialException generated by tests.FakeTCP context manager."
         )