Add timeout configure item and set it as 30m

bug: 182519645
Test: atest VtsHalTvTunerV1_0TargetTest
Change-Id: I82c4617ae4c9c3109b972b22984ca6db706c1e5d
This commit is contained in:
Henry Fang
2021-05-14 10:53:57 -07:00
parent 57323715d1
commit 2eaf17e767
5 changed files with 10 additions and 3 deletions

View File

@@ -30,5 +30,6 @@
<test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="VtsHalTvTunerV1_0TargetTest" />
<option name="native-test-timeout" value="30m" />
</test>
</configuration>

View File

@@ -29,5 +29,6 @@
<test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="VtsHalTvTunerV1_1TargetTest" />
<option name="native-test-timeout" value="30m" />
</test>
</configuration>

View File

@@ -306,8 +306,12 @@ AssertionResult FilterTests::configureMonitorEvent(uint64_t filterId, uint32_t m
android::hardware::tv::tuner::V1_1::IFilter::castFrom(mFilters[filterId]);
if (filter_v1_1 != NULL) {
status = filter_v1_1->configureMonitorEvent(monitorEventTypes);
mFilterCallbacks[filterId]->testFilterScramblingEvent();
mFilterCallbacks[filterId]->testFilterIpCidEvent();
if (monitorEventTypes & DemuxFilterMonitorEventType::SCRAMBLING_STATUS) {
mFilterCallbacks[filterId]->testFilterScramblingEvent();
}
if (monitorEventTypes & DemuxFilterMonitorEventType::IP_CID_CHANGE) {
mFilterCallbacks[filterId]->testFilterIpCidEvent();
}
} else {
ALOGW("[vts] Can't cast IFilter into v1_1.");
return failure();

View File

@@ -57,6 +57,7 @@ using android::hardware::tv::tuner::V1_0::Result;
using android::hardware::tv::tuner::V1_1::AvStreamType;
using android::hardware::tv::tuner::V1_1::DemuxFilterEventExt;
using android::hardware::tv::tuner::V1_1::DemuxFilterMonitorEvent;
using android::hardware::tv::tuner::V1_1::DemuxFilterMonitorEventType;
using android::hardware::tv::tuner::V1_1::IFilterCallback;
using android::hardware::tv::tuner::V1_1::ITuner;

View File

@@ -112,8 +112,8 @@ void TunerBroadcastHidlTest::mediaFilterUsingSharedMemoryTest(FilterConfig1_1 fi
ASSERT_TRUE(mFilterTests.openFilterInDemux(filterConf.config1_0.type,
filterConf.config1_0.bufferSize));
ASSERT_TRUE(mFilterTests.getNewlyOpenedFilterId_64bit(filterId));
ASSERT_TRUE(mFilterTests.getSharedAvMemoryHandle(filterId));
ASSERT_TRUE(mFilterTests.configFilter(filterConf.config1_0.settings, filterId));
ASSERT_TRUE(mFilterTests.getSharedAvMemoryHandle(filterId));
ASSERT_TRUE(mFilterTests.configAvFilterStreamType(filterConf.streamType, filterId));
ASSERT_TRUE(mFilterTests.getFilterMQDescriptor(filterId, filterConf.config1_0.getMqDesc));
ASSERT_TRUE(mFilterTests.startFilter(filterId));