diff options
| author | Ahmed ElArabawy <arabawy@google.com> | 2022-02-18 22:20:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-02-18 22:20:45 +0000 |
| commit | 98112251b197c63219d63c95f95325cd90224017 (patch) | |
| tree | b9cbbbddf82ad9009b03bfb2a84b6bfaefc9fbee /wifi | |
| parent | 51f3a442b1ac203bfa10459427ae74779413caee (diff) | |
| parent | 7f40eee6125dccf3853fcb6cdafecbfbeb785095 (diff) | |
Merge "Wifi: Fix VTS tests broken due to uprev to Vendor HAL 1.6" into tm-dev
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp | 11 | ||||
| -rw-r--r-- | wifi/1.5/vts/functional/wifi_sta_iface_hidl_test.cpp | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp b/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp index 72cde3ca71..8918997920 100644 --- a/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp +++ b/wifi/1.4/vts/functional/wifi_rtt_controller_hidl_test.cpp @@ -66,7 +66,9 @@ class WifiRttControllerHidlTest : public ::testing::TestWithParam<std::string> { stopWifi(GetInstanceName()); wifi_rtt_controller_ = getWifiRttController(); - ASSERT_NE(nullptr, wifi_rtt_controller_.get()); + if (wifi_rtt_controller_.get() == nullptr) { + GTEST_SKIP() << "Skipping this test since API is deprecated."; + } // Check RTT support before we run the test. std::pair<WifiStatus, RttCapabilities> status_and_caps; @@ -79,7 +81,7 @@ class WifiRttControllerHidlTest : public ::testing::TestWithParam<std::string> { virtual void TearDown() override { stopWifi(GetInstanceName()); } - // A simple test implementation of WifiChipEventCallback. + // A simple test implementation of WifiRttControllerEventCallback. class WifiRttControllerEventCallback : public ::testing::VtsHalHidlTargetCallbackBase< WifiRttControllerHidlTest>, @@ -122,6 +124,11 @@ class WifiRttControllerHidlTest : public ::testing::TestWithParam<std::string> { const auto& status_and_controller = HIDL_INVOKE(wifi_chip, createRttController_1_4, wifi_sta_iface); + + if (status_and_controller.first.code == WifiStatusCode::ERROR_NOT_SUPPORTED) { + return nullptr; + } + EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_controller.first.code); EXPECT_NE(nullptr, status_and_controller.second.get()); diff --git a/wifi/1.5/vts/functional/wifi_sta_iface_hidl_test.cpp b/wifi/1.5/vts/functional/wifi_sta_iface_hidl_test.cpp index 399307ecdc..7a0eb1f06f 100644 --- a/wifi/1.5/vts/functional/wifi_sta_iface_hidl_test.cpp +++ b/wifi/1.5/vts/functional/wifi_sta_iface_hidl_test.cpp @@ -94,6 +94,11 @@ TEST_P(WifiStaIfaceHidlTest, GetLinkLayerStats_1_5) { // Retrieve link layer stats. const auto& status_and_stats = HIDL_INVOKE(wifi_sta_iface_, getLinkLayerStats_1_5); + + if (status_and_stats.first.code == WifiStatusCode::ERROR_NOT_SUPPORTED) { + GTEST_SKIP() << "Skipping this test since API is deprecated."; + } + EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_stats.first.code); EXPECT_GT(status_and_stats.second.timeStampInMs, 0u); // Try to create 2nd iface. If yes, it should fill in the duty cycle field. |