From 2156f2182f804afbdb5c09d4bfafc377700bfdb8 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 24 Jul 2017 14:13:48 -0700 Subject: [PATCH] supplicant(vts): Remove start/stop framework This is already done by the test harness on the host side. So, no need to invoke this from within the gtest. Bug: 63914399 Test: `make vts -j30 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 && vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalWifiSupplicantV1_0Target -l INFO` Change-Id: I43edc03492bf5e03f9a4236265c43baa5efcd61d (cherry picked from commit 145cce98b56674404a6148835f008df44086db2e) Merged-Id: I43edc03492bf5e03f9a4236265c43baa5efcd61d (cherry picked from commit 80599435bd56af3792b3b5ceaa9c337aced9841c) --- .../VtsHalWifiSupplicantV1_0TargetTest.cpp | 3 --- .../vts/functional/supplicant_hidl_test_utils.cpp | 13 ------------- 2 files changed, 16 deletions(-) diff --git a/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp b/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp index a69d14d1f0..33f30496d2 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 df4bfa95ca..79be2b043d 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 @@ -135,19 +135,6 @@ class ServiceNotificationListener : public IServiceNotification { 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() { DriverTool driver_tool; SupplicantManager supplicant_manager;