Merge "Disable Tuner HAL VTS test cases that use un-licensed stream."

am: 116a7e2ed4

Change-Id: Ica3909c2f4c5aee47831498e96f42f9f46be51c5
This commit is contained in:
Amy Zhang 2020-01-23 08:53:03 -08:00 committed by android-build-merger
commit 0d0f895e71

View file

@ -1322,7 +1322,7 @@ TEST_F(TunerHidlTest, CloseFrontend) {
} }
} }
/*TEST_F(TunerHidlTest, CreateDemuxWithFrontend) { TEST_F(TunerHidlTest, CreateDemuxWithFrontend) {
Result status; Result status;
hidl_vec<FrontendId> feIds; hidl_vec<FrontendId> feIds;
@ -1347,7 +1347,7 @@ TEST_F(TunerHidlTest, CloseFrontend) {
ASSERT_TRUE(createDemuxWithFrontend(feIds[i], settings)); ASSERT_TRUE(createDemuxWithFrontend(feIds[i], settings));
mFrontend->stopTune(); mFrontend->stopTune();
} }
}*/ }
TEST_F(TunerHidlTest, CreateDemux) { TEST_F(TunerHidlTest, CreateDemux) {
description("Create Demux"); description("Create Demux");
@ -1371,8 +1371,10 @@ TEST_F(TunerHidlTest, CloseDescrambler) {
/* /*
* DATA FLOW TESTS * DATA FLOW TESTS
*
* TODO: re-enable the tests after finalizing the testing stream.
*/ */
TEST_F(TunerHidlTest, PlaybackDataFlowWithSectionFilterTest) { /*TEST_F(TunerHidlTest, PlaybackDataFlowWithSectionFilterTest) {
description("Feed ts data from playback and configure pes filter to get output"); description("Feed ts data from playback and configure pes filter to get output");
// todo modulize the filter conf parser // todo modulize the filter conf parser
@ -1481,7 +1483,7 @@ TEST_F(TunerHidlTest, RecordDataFlowWithTsRecordFilterTest) {
vector<string> goldenOutputFiles; vector<string> goldenOutputFiles;
ASSERT_TRUE(recordDataFlowTest(filterConf, recordSetting, goldenOutputFiles)); ASSERT_TRUE(recordDataFlowTest(filterConf, recordSetting, goldenOutputFiles));
} }*/
} // namespace } // namespace