From 2ad36303026909754059b1fa486ad065b3ed25ec Mon Sep 17 00:00:00 2001 From: Bhakthavatsala Raghavendra Date: Tue, 12 Mar 2024 16:12:32 -0700 Subject: [PATCH] uwb: Keep VTS timeout to be consistent with UWB stack Change-Id: I17367f955ced5ea3d109af06122678f8e6e8cda1 --- uwb/aidl/vts/VtsHalUwbTargetTest.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/uwb/aidl/vts/VtsHalUwbTargetTest.cpp b/uwb/aidl/vts/VtsHalUwbTargetTest.cpp index 3b0b60657e..548cae0217 100644 --- a/uwb/aidl/vts/VtsHalUwbTargetTest.cpp +++ b/uwb/aidl/vts/VtsHalUwbTargetTest.cpp @@ -39,6 +39,8 @@ using ndk::SpAIBinder; namespace { constexpr static int kCallbackTimeoutMs = 250; +// this timeout should be same as AOSP stack timeout (HAL_OPEN_TIMEOUT_MS) +constexpr static int kOpenCallbackTimeoutMs = 20000; } // namespace class UwbClientCallback : public BnUwbClientCallback { @@ -105,7 +107,7 @@ class UwbAidl : public testing::TestWithParam { open_cb_promise.set_value(); } }); - std::chrono::milliseconds timeout{kCallbackTimeoutMs}; + std::chrono::milliseconds timeout{kOpenCallbackTimeoutMs}; const auto iuwb_chip = getAnyChip(); EXPECT_TRUE(iuwb_chip->open(callback).isOk()); EXPECT_EQ(open_cb_future.wait_for(timeout), std::future_status::ready); @@ -137,7 +139,7 @@ TEST_P(UwbAidl, ChipOpen) { open_cb_promise.set_value(); } }); - std::chrono::milliseconds timeout{kCallbackTimeoutMs}; + std::chrono::milliseconds timeout{kOpenCallbackTimeoutMs}; const auto iuwb_chip = getAnyChip(); EXPECT_TRUE(iuwb_chip->open(callback).isOk()); EXPECT_EQ(open_cb_future.wait_for(timeout), std::future_status::ready); @@ -158,12 +160,13 @@ TEST_P(UwbAidl, ChipClose) { close_cb_promise.set_value(); } }); - std::chrono::milliseconds timeout{kCallbackTimeoutMs}; + std::chrono::milliseconds open_timeout{kOpenCallbackTimeoutMs}; + std::chrono::milliseconds close_timeout{kCallbackTimeoutMs}; const auto iuwb_chip = getAnyChip(); EXPECT_TRUE(iuwb_chip->open(callback).isOk()); - EXPECT_EQ(open_cb_future.wait_for(timeout), std::future_status::ready); + EXPECT_EQ(open_cb_future.wait_for(open_timeout), std::future_status::ready); EXPECT_TRUE(iuwb_chip->close().isOk()); - EXPECT_EQ(close_cb_future.wait_for(timeout), std::future_status::ready); + EXPECT_EQ(close_cb_future.wait_for(close_timeout), std::future_status::ready); } TEST_P(UwbAidl, ChipCoreInit) {