diff options
author | Roshan Pius <rpius@google.com> | 2020-08-18 09:19:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-18 09:19:12 +0000 |
commit | 5fdc6b6469746d57729270b8e64775ee1a58a20d (patch) | |
tree | aae6f505097d8475233a1d56ce38845764259767 | |
parent | 9e5e724e1a63064e217b089b59d2b1d7b751900a (diff) | |
parent | 2595661c0d8e088b7d9f19dfad39b0b13ac169df (diff) | |
download | interfaces-5fdc6b6469746d57729270b8e64775ee1a58a20d.tar.gz |
supplicant(vts): Stop framework after querying package manager am: 2595661c0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12351743
Change-Id: I6f932c5504f0506753af28bcebf0b387f7f39583
9 files changed, 53 insertions, 13 deletions
diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp index 4f25465d79..47f0394db1 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp @@ -40,16 +40,22 @@ class SupplicantHidlTest virtual void SetUp() override { wifi_instance_name_ = std::get<0>(GetParam()); supplicant_instance_name_ = std::get<1>(GetParam()); + isP2pOn_ = + testing::deviceSupportsFeature("android.hardware.wifi.direct"); + // Stop Framework + std::system("/system/bin/stop"); stopSupplicant(wifi_instance_name_); startSupplicantAndWaitForHidlService(wifi_instance_name_, supplicant_instance_name_); - isP2pOn_ = - testing::deviceSupportsFeature("android.hardware.wifi.direct"); supplicant_ = getSupplicant(supplicant_instance_name_, isP2pOn_); ASSERT_NE(supplicant_.get(), nullptr); } - virtual void TearDown() override { stopSupplicant(wifi_instance_name_); } + virtual void TearDown() override { + stopSupplicant(wifi_instance_name_); + // Start Framework + std::system("/system/bin/start"); + } protected: // ISupplicant object used for all tests in this fixture. diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp index 8d6f38d8eb..c333c4f859 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp @@ -77,11 +77,13 @@ class SupplicantP2pIfaceHidlTest virtual void SetUp() override { wifi_instance_name_ = std::get<0>(GetParam()); supplicant_instance_name_ = std::get<1>(GetParam()); + isP2pOn_ = + testing::deviceSupportsFeature("android.hardware.wifi.direct"); + // Stop Framework + std::system("/system/bin/stop"); stopSupplicant(wifi_instance_name_); startSupplicantAndWaitForHidlService(wifi_instance_name_, supplicant_instance_name_); - isP2pOn_ = - testing::deviceSupportsFeature("android.hardware.wifi.direct"); supplicant_ = getSupplicant(supplicant_instance_name_, isP2pOn_); EXPECT_TRUE(turnOnExcessiveLogging(supplicant_)); p2p_iface_ = getSupplicantP2pIface(supplicant_); @@ -91,7 +93,11 @@ class SupplicantP2pIfaceHidlTest memcpy(peer_mac_addr_.data(), kTestPeerMacAddr, peer_mac_addr_.size()); } - virtual void TearDown() override { stopSupplicant(wifi_instance_name_); } + virtual void TearDown() override { + stopSupplicant(wifi_instance_name_); + // Start Framework + std::system("/system/bin/start"); + } protected: bool isP2pOn_ = false; diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp index 089b3cd002..ff287541f8 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp @@ -72,11 +72,13 @@ class SupplicantStaIfaceHidlTest virtual void SetUp() override { wifi_instance_name_ = std::get<0>(GetParam()); supplicant_instance_name_ = std::get<1>(GetParam()); + isP2pOn_ = + testing::deviceSupportsFeature("android.hardware.wifi.direct"); + // Stop Framework + std::system("/system/bin/stop"); stopSupplicant(wifi_instance_name_); startSupplicantAndWaitForHidlService(wifi_instance_name_, supplicant_instance_name_); - isP2pOn_ = - testing::deviceSupportsFeature("android.hardware.wifi.direct"); supplicant_ = getSupplicant(supplicant_instance_name_, isP2pOn_); EXPECT_TRUE(turnOnExcessiveLogging(supplicant_)); sta_iface_ = getSupplicantStaIface(supplicant_); @@ -85,7 +87,11 @@ class SupplicantStaIfaceHidlTest memcpy(mac_addr_.data(), kTestMacAddr, mac_addr_.size()); } - virtual void TearDown() override { stopSupplicant(wifi_instance_name_); } + virtual void TearDown() override { + stopSupplicant(wifi_instance_name_); + // Start Framework + std::system("/system/bin/start"); + } protected: bool isP2pOn_ = false; diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp index 5467e02799..295ebfb808 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp @@ -85,11 +85,13 @@ class SupplicantStaNetworkHidlTest virtual void SetUp() override { wifi_instance_name_ = std::get<0>(GetParam()); supplicant_instance_name_ = std::get<1>(GetParam()); + isP2pOn_ = + testing::deviceSupportsFeature("android.hardware.wifi.direct"); + // Stop Framework + std::system("/system/bin/stop"); stopSupplicant(wifi_instance_name_); startSupplicantAndWaitForHidlService(wifi_instance_name_, supplicant_instance_name_); - isP2pOn_ = - testing::deviceSupportsFeature("android.hardware.wifi.direct"); supplicant_ = getSupplicant(supplicant_instance_name_, isP2pOn_); EXPECT_TRUE(turnOnExcessiveLogging(supplicant_)); sta_network_ = createSupplicantStaNetwork(supplicant_); @@ -103,7 +105,11 @@ class SupplicantStaNetworkHidlTest ssid_.assign(kTestSsidStr, kTestSsidStr + strlen(kTestSsidStr)); } - virtual void TearDown() override { stopSupplicant(wifi_instance_name_); } + virtual void TearDown() override { + stopSupplicant(wifi_instance_name_); + // Start Framework + std::system("/system/bin/start"); + } protected: void removeNetwork() { diff --git a/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test_utils_1_1.h b/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test_utils_1_1.h index 3629882f94..2104794770 100644 --- a/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test_utils_1_1.h +++ b/wifi/supplicant/1.1/vts/functional/supplicant_hidl_test_utils_1_1.h @@ -44,6 +44,8 @@ class SupplicantHidlTestBase supplicant_v1_1_instance_name_ = std::get<1>(GetParam()); isP2pOn_ = testing::deviceSupportsFeature("android.hardware.wifi.direct"); + // Stop Framework + std::system("/system/bin/stop"); stopSupplicant(wifi_v1_0_instance_name_); startSupplicantAndWaitForHidlService(wifi_v1_0_instance_name_, supplicant_v1_1_instance_name_); @@ -54,6 +56,8 @@ class SupplicantHidlTestBase virtual void TearDown() override { stopSupplicant(wifi_v1_0_instance_name_); + // Start Framework + std::system("/system/bin/start"); } protected: diff --git a/wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.h b/wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.h index 5ecfdd48ef..2a432d075c 100644 --- a/wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.h +++ b/wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.h @@ -50,6 +50,8 @@ class SupplicantHidlTestBase supplicant_v1_2_instance_name_ = std::get<1>(GetParam()); isP2pOn_ = testing::deviceSupportsFeature("android.hardware.wifi.direct"); + // Stop Framework + std::system("/system/bin/stop"); stopSupplicant(wifi_v1_0_instance_name_); startSupplicantAndWaitForHidlService(wifi_v1_0_instance_name_, supplicant_v1_2_instance_name_); @@ -61,6 +63,8 @@ class SupplicantHidlTestBase virtual void TearDown() override { stopSupplicant(wifi_v1_0_instance_name_); + // Start Framework + std::system("/system/bin/start"); } protected: diff --git a/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp b/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp index 1eb8eea4ea..cab160bc1f 100644 --- a/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp +++ b/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp @@ -43,7 +43,7 @@ class SupplicantP2pIfaceHidlTest : public SupplicantHidlTestBase { virtual void SetUp() override { SupplicantHidlTestBase::SetUp(); EXPECT_TRUE(turnOnExcessiveLogging(supplicant_)); - if (!::testing::deviceSupportsFeature("android.hardware.wifi.direct")) { + if (!isP2pOn_) { GTEST_SKIP() << "Wi-Fi Direct is not supported, skip this test."; } p2p_iface_ = getSupplicantP2pIface_1_2(supplicant_); diff --git a/wifi/supplicant/1.3/vts/functional/supplicant_sta_iface_hidl_test.cpp b/wifi/supplicant/1.3/vts/functional/supplicant_sta_iface_hidl_test.cpp index 12bd122b14..011a955983 100644 --- a/wifi/supplicant/1.3/vts/functional/supplicant_sta_iface_hidl_test.cpp +++ b/wifi/supplicant/1.3/vts/functional/supplicant_sta_iface_hidl_test.cpp @@ -63,6 +63,8 @@ class SupplicantStaIfaceHidlTest supplicant_v1_3_instance_name_ = std::get<1>(GetParam()); isP2pOn_ = testing::deviceSupportsFeature("android.hardware.wifi.direct"); + // Stop Framework + std::system("/system/bin/stop"); stopSupplicant(wifi_v1_0_instance_name_); startSupplicantAndWaitForHidlService(wifi_v1_0_instance_name_, @@ -76,6 +78,8 @@ class SupplicantStaIfaceHidlTest virtual void TearDown() override { stopSupplicant(wifi_v1_0_instance_name_); + // Start Framework + std::system("/system/bin/start"); } int64_t pmkCacheExpirationTimeInSec; diff --git a/wifi/supplicant/1.3/vts/functional/supplicant_sta_network_hidl_test.cpp b/wifi/supplicant/1.3/vts/functional/supplicant_sta_network_hidl_test.cpp index 25091a5b92..5f60746845 100644 --- a/wifi/supplicant/1.3/vts/functional/supplicant_sta_network_hidl_test.cpp +++ b/wifi/supplicant/1.3/vts/functional/supplicant_sta_network_hidl_test.cpp @@ -51,6 +51,8 @@ class SupplicantStaNetworkHidlTest supplicant_v1_3_instance_name_ = std::get<1>(GetParam()); isP2pOn_ = testing::deviceSupportsFeature("android.hardware.wifi.direct"); + // Stop Framework + std::system("/system/bin/stop"); stopSupplicant(wifi_v1_0_instance_name_); startSupplicantAndWaitForHidlService(wifi_v1_0_instance_name_, @@ -66,6 +68,8 @@ class SupplicantStaNetworkHidlTest virtual void TearDown() override { stopSupplicant(wifi_v1_0_instance_name_); + // Start Framework + std::system("/system/bin/start"); } protected: |