Merge "Allow VTS tests to pass on devices without Supplicant AIDL."

This commit is contained in:
Gabriel Biren 2022-01-12 22:52:18 +00:00 committed by Gerrit Code Review
commit ac91c7c9dd
3 changed files with 3 additions and 0 deletions

View file

@ -620,6 +620,7 @@ TEST_P(SupplicantP2pIfaceAidlTest, AddAndRemoveUpnpService) {
p2p_iface_->removeUpnpService(0 /* version */, upnpServiceName).isOk()); p2p_iface_->removeUpnpService(0 /* version */, upnpServiceName).isOk());
} }
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantP2pIfaceAidlTest);
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantP2pIfaceAidlTest, INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantP2pIfaceAidlTest,
testing::ValuesIn(android::getAidlHalInstanceNames( testing::ValuesIn(android::getAidlHalInstanceNames(
ISupplicant::descriptor)), ISupplicant::descriptor)),

View file

@ -769,6 +769,7 @@ TEST_P(SupplicantStaIfaceAidlTest, StartDppConfiguratorInitiator) {
EXPECT_TRUE(sta_iface_->removeDppUri(peer_id).isOk()); EXPECT_TRUE(sta_iface_->removeDppUri(peer_id).isOk());
} }
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaIfaceAidlTest);
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantStaIfaceAidlTest, INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantStaIfaceAidlTest,
testing::ValuesIn(android::getAidlHalInstanceNames( testing::ValuesIn(android::getAidlHalInstanceNames(
ISupplicant::descriptor)), ISupplicant::descriptor)),

View file

@ -778,6 +778,7 @@ TEST_P(SupplicantStaNetworkAidlTest, GetWpsNfcConfigurationToken) {
EXPECT_NE(retrievedToken.size(), 0); EXPECT_NE(retrievedToken.size(), 0);
} }
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaNetworkAidlTest);
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantStaNetworkAidlTest, INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantStaNetworkAidlTest,
testing::ValuesIn(android::getAidlHalInstanceNames( testing::ValuesIn(android::getAidlHalInstanceNames(
ISupplicant::descriptor)), ISupplicant::descriptor)),