commit 6e19d104c741d406a3e3b12ac59e9475f729a091
author Roshan Pius <rpius@google.com> Mon Jul 24 23:18:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 24 23:18:51 2017 +0000
tree ab36f22dcd4e37adf59965e21914ee188e88750b
parent c6887a8d51e22ab7a59340db6c450558ac337fb5
parent 8d3ce3e6b958282c9175b6951571c346f6b84f02

Merge "supplicant(vts): Remove start/stop framework" into oc-dr1-dev am: 28b744d2d9
am: 8d3ce3e6b9

Change-Id: I9e9a6c8af3dc381d5ac43e4c4c9e6a2f637eb9dc

wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp

diff --git a/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp b/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp
index a69d14d..33f3049 100644
--- a/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp
+++ b/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp
@@ -23,12 +23,9 @@
 class SupplicantHidlEnvironment : public ::testing::Environment {
    public:
     virtual void SetUp() override {
-        stopWifiFramework();
         stopSupplicant();
     }
     virtual void TearDown() override {
-        startWifiFramework();
-        // Framework will start wpa_supplicant.
     }
 };
 

wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp

diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
index 0afab2f..3b75508 100644
--- a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
+++ b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
@@ -140,19 +140,6 @@
     std::condition_variable condition_;
 };
 
-void stopWifiFramework() {
-    ASSERT_EQ(std::system("stop"), 0);
-    // TODO: Use some other mechanism to wait for the framework to
-    // finish disabling.
-    sleep(5);
-}
-
-void startWifiFramework() {
-    ASSERT_EQ(std::system("start"), 0);
-    // These tests don't care whether the framework
-    // finished enabling or not.
-}
-
 void stopSupplicant() {
     SupplicantManager supplicant_manager;