Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 10:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

VTS: fix RadioHidlTest.getAvailableNetworks issue

Browse Source 
am: 14ad821b0a

Change-Id: Ic8a94dddc6ecc45df85ad3b8e6d74a5ce541ba26
This commit is contained in:
Iris Chang
2018-04-24 01:54:56 -07:00
committed by android-build-merger
parent 2e1349eb79 14ad821b0a
commit ab2a35a56e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
View File

@@ -142,7 +142,7 @@ TEST_F(RadioHidlTest, getAvailableNetworks) {
int serial = GetRandomSerialNumber();
radio->getAvailableNetworks(serial);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(std::cv_status::no_timeout, wait(300));
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
ASSERT_TRUE(radioRsp->rspInfo.type == RadioResponseType::SOLICITED ||
radioRsp->rspInfo.type == RadioResponseType::SOLICITED_ACK_EXP);

4
radio/1.0/vts/functional/radio_hidl_hal_test.cpp
View File

@@ -54,13 +54,13 @@ void RadioHidlTest::notify() {
cv.notify_one();
}
std::cv_status RadioHidlTest::wait() {
std::cv_status RadioHidlTest::wait(int sec) {
std::unique_lock<std::mutex> lock(mtx);
std::cv_status status = std::cv_status::no_timeout;
auto now = std::chrono::system_clock::now();
while (count == 0) {
status = cv.wait_until(lock, now + std::chrono::seconds(TIMEOUT_PERIOD));
status = cv.wait_until(lock, now + std::chrono::seconds(sec));
if (status == std::cv_status::timeout) {
return status;
}

4
radio/1.0/vts/functional/radio_hidl_hal_utils.h
View File

@@ -456,7 +456,7 @@ class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase {
void notify();
/* Test code calls this function to wait for response */
std::cv_status wait();
std::cv_status wait(int sec = TIMEOUT_PERIOD);
/* Used for checking General Errors */
bool CheckGeneralError();
@@ -474,4 +474,4 @@ class RadioHidlEnvironment : public ::testing::Environment {
public:
virtual void SetUp() {}
virtual void TearDown() {}
};
};