Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-30 04:06:33 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

mavsdk_tests: use speed factor, increase timeouts

Browse Source 
We had not actually properly adjusted the timeout to the lockstep speed
factor. Once we did that, we had to increase the timeouts quite a bit to
have the tests pass.
This commit is contained in:
Julian Oes
2020-07-31 09:41:08 +02:00
committed by Daniel Agar
parent 4eb1ea10f0
commit a5a577a6c4
5 changed files with 78 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/mavsdk_tests/autopilot_tester.h
+4 -4
View File
@@ -79,7 +79,7 @@ public:
void land();
void transition_to_fixedwing();
void transition_to_multicopter();
void wait_until_disarmed(std::chrono::seconds timeout_duration = std::chrono::seconds(90));
void wait_until_disarmed(std::chrono::seconds timeout_duration = std::chrono::seconds(60));
void wait_until_hovering();
void prepare_square_mission(MissionOptions mission_options);
void prepare_straight_mission(MissionOptions mission_options);
@@ -116,13 +116,13 @@ private:
std::function<bool()> fun, std::chrono::duration<Rep, Period> duration)
{
// We need millisecond resolution for sleeping.
std::chrono::milliseconds duration_ms(duration);
adjust_to_lockstep_speed(duration_ms);
const std::chrono::milliseconds duration_ms(duration);
const auto duration_ms_adjusted = adjust_to_lockstep_speed(duration_ms);
unsigned iteration = 0;
while (!fun()) {
std::this_thread::sleep_for(duration_ms / 100);
std::this_thread::sleep_for(duration_ms_adjusted / 100);
if (iteration++ >= 100) {
return false;