From bc081a5d04fca89e20384e665cdab8949cc343e5 Mon Sep 17 00:00:00 2001 From: jonas Date: Wed, 18 Nov 2026 15:14:14 +0100 Subject: [PATCH] test(mavsdk_tests): remove the headwind stronger than pusher case It could not fail: in a multicopter position hold no other quad-chute check runs and nothing commands a transition, so it passed whether or not the pusher failure was reported. Assisted-by: Claude:claude-opus-5-5 --- .../autopilot_tester_pusher_failure.py | 12 ++--------- test/mavsdk_tests/test_vtol_pusher_failure.py | 20 +------------------ 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/test/mavsdk_tests/autopilot_tester_pusher_failure.py b/test/mavsdk_tests/autopilot_tester_pusher_failure.py index b0ebb857b3b..b31fba6ae89 100644 --- a/test/mavsdk_tests/autopilot_tester_pusher_failure.py +++ b/test/mavsdk_tests/autopilot_tester_pusher_failure.py @@ -184,16 +184,8 @@ class AutopilotTesterPusherFailure(AutopilotTester): except ActionError as e: log("Front transition denied: {}".format(e)) - def log_quadchutes_since(self, since_s: float) -> None: - quadchutes = self._quadchutes_since(since_s) - if not quadchutes: - log("No quad-chute") - for quadchute in quadchutes: - log("Quad-chute {} after {:.1f} s".format( - quadchute.event_name, quadchute.time_s - since_s)) - - def check_no_quadchute(self, allowed_event: Optional[str] = None) -> None: - quadchutes = [q for q in self._quadchutes_since(0.0) if q.event_name != allowed_event] + def check_no_quadchute(self) -> None: + quadchutes = self._quadchutes_since(0.0) assert not quadchutes, "Quad-chute {} at {:.1f} s".format( quadchutes[0].event_name, quadchutes[0].time_s) diff --git a/test/mavsdk_tests/test_vtol_pusher_failure.py b/test/mavsdk_tests/test_vtol_pusher_failure.py index 17a005f6645..2535cdfb674 100644 --- a/test/mavsdk_tests/test_vtol_pusher_failure.py +++ b/test/mavsdk_tests/test_vtol_pusher_failure.py @@ -22,9 +22,7 @@ SIH has constant wind only and a 0.2 kg vehicle, so the flights check behavior, import pytest -from autopilot_tester_pusher_failure import (PUSHER_QUADCHUTE_EVENT, - AutopilotTesterPusherFailure, FixedWingReached, - Wind) +from autopilot_tester_pusher_failure import AutopilotTesterPusherFailure, FixedWingReached, Wind ALTITUDE_M = 20.0 SETTLE_S = 10.0 @@ -40,7 +38,6 @@ CROSSWIND = Wind(from_east_m_s=3.0) # Weak enough for pusher assist to still push before the failure, which it does not at 3 m/s. TAILWIND = Wind(from_north_m_s=-1.0) STRONG_WIND = Wind(from_north_m_s=5.0) -TOO_STRONG_WIND = Wind(from_north_m_s=8.0) @pytest.mark.vtol_pusher_failure @@ -105,21 +102,6 @@ def test_working_pusher_holding_position_in_strong_wind( tester.check_no_quadchute() -@pytest.mark.vtol_pusher_failure -def test_headwind_stronger_than_pusher( - tester_pusher_failure: AutopilotTesterPusherFailure) -> None: - """Accepted, not required: the vehicle cannot hold its position with pusher assist, which - may be reported as a pusher failure.""" - tester = tester_pusher_failure - tester.take_off_with_pusher_assist(ALTITUDE_M) - wind_time_s = tester.time_s() - tester.set_wind(TOO_STRONG_WIND, 60) - - tester.log_quadchutes_since(wind_time_s) - tester.check_no_quadchute(allowed_event=PUSHER_QUADCHUTE_EVENT) - tester.check_only_multicopter_since(wind_time_s) - - @pytest.mark.vtol_pusher_failure @pytest.mark.parametrize("use_airspeed", [ True,