From 0cc4b41a51722bfb92b6824ffb773afa34473f22 Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Thu, 22 Feb 2024 14:45:42 +0100 Subject: [PATCH] MAVSDK test: Fix fly_forward_in_altctl() timing --- test/mavsdk_tests/autopilot_tester.cpp | 3 +++ test/mavsdk_tests/test_multicopter_manual.cpp | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/mavsdk_tests/autopilot_tester.cpp b/test/mavsdk_tests/autopilot_tester.cpp index d9c5fb5151..ffba005424 100644 --- a/test/mavsdk_tests/autopilot_tester.cpp +++ b/test/mavsdk_tests/autopilot_tester.cpp @@ -476,6 +476,9 @@ void AutopilotTester::fly_forward_in_altctl() } CHECK(_manual_control->start_altitude_control() == ManualControl::Result::Success); + store_home(); + wait_until_ready(); + arm(); // Climb up for 20 seconds for (unsigned i = 0; i < 20 * manual_control_rate_hz; ++i) { diff --git a/test/mavsdk_tests/test_multicopter_manual.cpp b/test/mavsdk_tests/test_multicopter_manual.cpp index b4ad122670..34fa8b4351 100644 --- a/test/mavsdk_tests/test_multicopter_manual.cpp +++ b/test/mavsdk_tests/test_multicopter_manual.cpp @@ -48,9 +48,6 @@ TEST_CASE("Fly forward in altitude control", "[multicopter][vtol]") { AutopilotTester tester; tester.connect(connection_url); - tester.wait_until_ready(); - tester.store_home(); - tester.arm(); tester.fly_forward_in_altctl(); std::chrono::seconds until_disarmed_timeout = std::chrono::seconds(180); tester.wait_until_disarmed(until_disarmed_timeout);