Merge "supplicant(vts): Remove start/stop framework" into oreo-vts-dev (d2913668) · Commits · e / os / android_hardware_interfaces

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

+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
		@@ -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;