| commit | 29c1bdbd5e4f01efce3d9be254b0654fccd9b57c | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Mon Jul 24 23:21:22 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 24 23:21:22 2017 +0000 |
| tree | 3cd02dfcff4a6ffb6b1dae89919a6cc15e6cff91 | |
| parent | 4a26d8e868c93a6be6188e30186c53f0185738db [diff] | |
| parent | 6e19d104c741d406a3e3b12ac59e9475f729a091 [diff] |
Merge "supplicant(vts): Remove start/stop framework" into oc-dr1-dev am: 28b744d2d9 am: 8d3ce3e6b9 am: 6e19d104c7 Change-Id: I669efc393ac50cf7fe5ca979f022f0bb9dae9c45
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. } };
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;