Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d73f047 authored Nov 17, 2017 by Keun Soo Yim Committed by Android (Google) Code Review Nov 17, 2017

Merge "VTS: fix RadioHidlTest.getAvailableNetworks issue" into oc-mr1-dev

parents ac20dd4a 8dc6db21

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

radio/1.0/vts/functional/radio_hidl_hal_test.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,13 +51,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;
		}

radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -527,7 +527,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();

radio/1.1/vts/functional/radio_hidl_hal_test.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,13 +52,13 @@ void RadioHidlTest_v1_1::notify() {
		cv.notify_one();
		}

		std::cv_status RadioHidlTest_v1_1::wait() {
		std::cv_status RadioHidlTest_v1_1::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;
		}

radio/1.1/vts/functional/radio_hidl_hal_utils_v1_1.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -550,7 +550,7 @@ class RadioHidlTest_v1_1 : 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();