From b04d9e28d6b904b70f67a39f7bc287763d7311f7 Mon Sep 17 00:00:00 2001 From: "Saurkar, Nikita" Date: Tue, 20 Jun 2023 20:51:01 +0530 Subject: [PATCH] Fix framegrabber and swupdater test case --- ChangeLog.md | 3 +++ .../src/libifm3d_framegrabber/frame_grabber_impl.hpp | 2 +- modules/swupdater/test/ifm3d-swupdater-tests.cpp | 12 ++---------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index de4c594b..8a4ba71e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed +- Fixed the error reporting through onError callback + ## 1.3.2 - 2023-06-16 ### Added - Add env variable IFM3D_SWUPDATE_CURL_TIMEOUT for curl transaction timeout during swupdate diff --git a/modules/framegrabber/src/libifm3d_framegrabber/frame_grabber_impl.hpp b/modules/framegrabber/src/libifm3d_framegrabber/frame_grabber_impl.hpp index 6910c28a..55e0801c 100644 --- a/modules/framegrabber/src/libifm3d_framegrabber/frame_grabber_impl.hpp +++ b/modules/framegrabber/src/libifm3d_framegrabber/frame_grabber_impl.hpp @@ -348,7 +348,7 @@ ifm3d::FrameGrabber::Impl::Run(const std::optional& schema) if (ex.code() != IFM3D_THREAD_INTERRUPTED) { LOG_WARNING(ex.what()); - // this->ReportError(ex); + this->ReportError(ex); error = ex; } } diff --git a/modules/swupdater/test/ifm3d-swupdater-tests.cpp b/modules/swupdater/test/ifm3d-swupdater-tests.cpp index 7f732b30..9b91134f 100644 --- a/modules/swupdater/test/ifm3d-swupdater-tests.cpp +++ b/modules/swupdater/test/ifm3d-swupdater-tests.cpp @@ -41,27 +41,19 @@ TEST_F(SWUpdater, DetectBootMode) auto cam = ifm3d::Device::MakeShared(); auto swu = std::make_shared(cam); - if (cam->AmI(ifm3d::Device::device_family::O3R)) - { - /* both mode are active at the same time */ - EXPECT_TRUE(swu->WaitForProductive(-1)); - EXPECT_TRUE(swu->WaitForRecovery(-1)); - return; - } - EXPECT_TRUE(swu->WaitForProductive(-1)); EXPECT_FALSE(swu->WaitForRecovery(-1)); EXPECT_FALSE(swu->WaitForRecovery(5000)); swu->RebootToRecovery(); - EXPECT_TRUE(swu->WaitForRecovery(80000)); + EXPECT_TRUE(swu->WaitForRecovery(100000)); EXPECT_FALSE(swu->WaitForProductive(-1)); EXPECT_TRUE(swu->WaitForRecovery(-1)); EXPECT_FALSE(swu->WaitForProductive(5000)); swu->RebootToProductive(); - EXPECT_TRUE(swu->WaitForProductive(80000)); + EXPECT_TRUE(swu->WaitForProductive(100000)); EXPECT_TRUE(swu->WaitForProductive(-1)); EXPECT_FALSE(swu->WaitForRecovery(-1));