From 54382a1f72b3779002e9fcaca9ab5d9905e3dd9a Mon Sep 17 00:00:00 2001 From: Gabriel Biren Date: Fri, 15 Dec 2023 22:28:31 +0000 Subject: [PATCH] Check interface version when running the VTS test for disableEht. New AIDL methods are not available on the next configuration. Bug: 314851431 Test: atest VtsHalWifiSupplicantStaNetworkTargetTest # Test runs on the trunk configuration, but # gets skipped on the next configuration. Change-Id: I13bcfa51146e14932a8f377b1590719a683cea4f --- .../aidl/vts/functional/supplicant_sta_network_aidl_test.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wifi/supplicant/aidl/vts/functional/supplicant_sta_network_aidl_test.cpp b/wifi/supplicant/aidl/vts/functional/supplicant_sta_network_aidl_test.cpp index 757414195e..e5e9735a18 100644 --- a/wifi/supplicant/aidl/vts/functional/supplicant_sta_network_aidl_test.cpp +++ b/wifi/supplicant/aidl/vts/functional/supplicant_sta_network_aidl_test.cpp @@ -110,6 +110,7 @@ class SupplicantStaNetworkAidlTest initializeService(); supplicant_ = getSupplicant(GetParam().c_str()); ASSERT_NE(supplicant_, nullptr); + ASSERT_TRUE(supplicant_->getInterfaceVersion(&interface_version_).isOk()); ASSERT_TRUE(supplicant_ ->setDebugParams(DebugLevel::EXCESSIVE, true, // show timestamps @@ -131,6 +132,7 @@ class SupplicantStaNetworkAidlTest std::shared_ptr supplicant_; std::shared_ptr sta_iface_; std::shared_ptr sta_network_; + int interface_version_; void removeNetwork() { ASSERT_NE(sta_iface_, nullptr); @@ -826,6 +828,9 @@ TEST_P(SupplicantStaNetworkAidlTest, SetMinimumTlsVersionEapPhase1Param) { * disableEht */ TEST_P(SupplicantStaNetworkAidlTest, DisableEht) { + if (interface_version_ < 3) { + GTEST_SKIP() << "disableEht is available as of Supplicant V3"; + } EXPECT_TRUE(sta_network_->disableEht().isOk()); }