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

Commit eac723ab 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

am: ff997040

Change-Id: I7fa5ea93db0cc3677f904ec0ce1f4c61c77f9d62
parents c6887a8d ff997040
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;