Skip to content

Commit 2223f76

Browse files
authored
Merge pull request #2577 from mavlink/pr-wait-camera-list
system_tests: make camera discovery more robust
2 parents 52eaa3e + 1985688 commit 2223f76

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

src/system_tests/camera_format_storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ TEST(SystemTest, CameraFormatStorage)
5555

5656
auto camera = Camera{system};
5757

58-
std::this_thread::sleep_for(std::chrono::milliseconds(500));
58+
std::this_thread::sleep_for(std::chrono::milliseconds(1500));
5959
// We expect to find one camera.
6060
ASSERT_EQ(camera.camera_list().cameras.size(), 1);
6161

src/system_tests/camera_list_cameras.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ TEST(SystemTest, CameraListCameras)
5656
});
5757

5858
// We have to wait until camera is found.
59-
std::this_thread::sleep_for(std::chrono::milliseconds(1000));
59+
std::this_thread::sleep_for(std::chrono::milliseconds(1500));
6060

6161
EXPECT_EQ(camera.camera_list().cameras.size(), 1);
6262
EXPECT_TRUE(found_camera);

src/system_tests/camera_mode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ TEST(SystemTest, CameraMode)
6464

6565
auto camera = Camera{system};
6666

67-
std::this_thread::sleep_for(std::chrono::milliseconds(500));
67+
std::this_thread::sleep_for(std::chrono::milliseconds(1500));
6868
// We expect to find one camera.
6969
ASSERT_EQ(camera.camera_list().cameras.size(), 1);
7070

src/system_tests/camera_storage.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ TEST(SystemTest, CameraStorage)
5454

5555
auto camera = Camera{system};
5656

57-
std::this_thread::sleep_for(std::chrono::milliseconds(500));
57+
std::this_thread::sleep_for(std::chrono::milliseconds(1500));
5858
EXPECT_EQ(camera.camera_list().cameras.size(), 1);
5959

6060
std::this_thread::sleep_for(std::chrono::milliseconds(500));
@@ -77,4 +77,4 @@ TEST(SystemTest, CameraStorage)
7777
got_storage = true;
7878
}
7979
EXPECT_TRUE(got_storage);
80-
}
80+
}

src/system_tests/camera_take_photo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ TEST(SystemTest, CameraTakePhoto)
6363

6464
auto camera = Camera{system};
6565

66-
std::this_thread::sleep_for(std::chrono::milliseconds(500));
66+
std::this_thread::sleep_for(std::chrono::milliseconds(1500));
6767
// We expect to find one camera.
6868
ASSERT_EQ(camera.camera_list().cameras.size(), 1);
6969

src/system_tests/camera_take_photo_interval.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ TEST(SystemTest, CameraTakePhotoInterval)
5959

6060
auto camera = Camera{system};
6161

62-
std::this_thread::sleep_for(std::chrono::milliseconds(500));
62+
std::this_thread::sleep_for(std::chrono::milliseconds(1500));
6363
// We expect to find one camera.
6464
ASSERT_EQ(camera.camera_list().cameras.size(), 1);
6565

src/system_tests/camera_video_stream.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ TEST(SystemTest, CameraVideoStreamSettings)
5656

5757
auto camera = Camera{system};
5858

59-
std::this_thread::sleep_for(std::chrono::milliseconds(500));
59+
std::this_thread::sleep_for(std::chrono::milliseconds(1500));
6060
auto prom_got_info = std::promise<void>();
6161
auto fut_got_info = prom_got_info.get_future();
6262
camera.subscribe_video_stream_info([&](const Camera::VideoStreamUpdate& update) {

0 commit comments

Comments
 (0)