Merge cherrypicks of [3116469, 3116470, 3116074, 3116075, 3116498, 3116499, 3117095, 3115988, 3116845, 3116471, 3116500, 3116573, 3115989, 3116501, 3116076, 3116472] into oc-mr1-release
Change-Id: Ife6e09e2f1d11dddef8d8cdb88382ca7fad708cc
diff --git a/wifi/V1_0/host/VtsHalWifiV1_0HostTest.py b/wifi/V1_0/host/VtsHalWifiV1_0HostTest.py
index c2c313d..085014d 100644
--- a/wifi/V1_0/host/VtsHalWifiV1_0HostTest.py
+++ b/wifi/V1_0/host/VtsHalWifiV1_0HostTest.py
@@ -17,6 +17,7 @@
import logging
+from vts.runners.host import asserts
from vts.runners.host import const
from vts.runners.host import test_runner
from vts.testcases.template.hal_hidl_gtest import hal_hidl_gtest
@@ -28,6 +29,18 @@
WIFI_AWARE_FEATURE_NAME = "android.hardware.wifi.aware"
+ def setUpClass(self):
+ super(VtsHalWifiV1_0Host, self).setUpClass()
+ results = self.shell.Execute("setprop ctl.stop wpa_supplicant")
+ asserts.assertEqual(0, results[const.EXIT_CODE][0])
+ results = self.shell.Execute("setprop ctl.stop wificond")
+ asserts.assertEqual(0, results[const.EXIT_CODE][0])
+
+ def tearDownClass(self):
+ results = self.shell.Execute("setprop ctl.start wificond")
+ if results[const.EXIT_CODE][0] != 0:
+ logging.error('Failed to start wificond')
+
def CreateTestCases(self):
"""Get all registered test components and create test case objects."""
pm_list = self.shell.Execute("pm list features")
