Merge "Allow VTS tests to pass on devices without Supplicant AIDL." am: ac91c7c9dd am: 57aaae7ad5 am: fc12c9d39e am: 64203384b1

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1945692

Change-Id: I5272834ecb124da1a3cfeb5a1ca7f79da78fc655
This commit is contained in:
Gabriel Biren
2022-01-12 23:27:55 +00:00
committed by Automerger Merge Worker
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());
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantP2pIfaceAidlTest);
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantP2pIfaceAidlTest,
testing::ValuesIn(android::getAidlHalInstanceNames(
ISupplicant::descriptor)),

View File

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

View File

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