Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff997040 authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "supplicant(vts): Remove start/stop framework" into oc-dr1-dev

am: 28b744d2

Change-Id: I8c132964384d608772d6dc74c760118f49bc7be0
parents 19f4c10b 28b744d2
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -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.
    }
};

+0 −13
Original line number Diff line number Diff line
@@ -140,19 +140,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() {
    SupplicantManager supplicant_manager;