[ACTS] Fix test setup
Cherry picked changes from master
Bug: 168813150
Fixes: 168813150
Test: acts RttDisableTest
Merged-In: I13b17df6aa3de1c2f91a1a63bd6383f413a81e17
Change-Id: I42e2cb442b9b1b75869f0c6f1588e00572f486a0
diff --git a/acts/tests/google/wifi/WifiWpa3OweTest.py b/acts/tests/google/wifi/WifiWpa3OweTest.py
index 7cd1903..b724310 100644
--- a/acts/tests/google/wifi/WifiWpa3OweTest.py
+++ b/acts/tests/google/wifi/WifiWpa3OweTest.py
@@ -14,22 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import itertools
-import pprint
-import queue
-import time
-
-import acts.base_test
-import acts.signals as signals
import acts.test_utils.wifi.wifi_test_utils as wutils
-import acts.utils
-from acts import asserts
-from acts.controllers.ap_lib import hostapd_constants
from acts.test_decorators import test_tracker_info
from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
-WifiEnums = wutils.WifiEnums
class WifiWpa3OweTest(WifiBaseTest):
"""Tests for APIs in Android's WifiManager class.
@@ -46,16 +35,17 @@
self.dut_client = self.android_devices[1]
wutils.wifi_test_device_init(self.dut)
wutils.wifi_test_device_init(self.dut_client)
- req_params = ["owe_networks", "wpa3_personal"]
- opt_param = []
- self.unpack_userparams(
- req_param_names=req_params, opt_param_names=opt_param)
+ req_params = ["owe_networks", "sae_networks"]
+ self.unpack_userparams(req_param_names=req_params,)
wutils.wifi_toggle_state(self.dut, True)
wutils.wifi_toggle_state(self.dut_client, True)
+ if "OpenWrtAP" in self.user_params:
+ self.configure_openwrt_ap_and_start(owe_network=True,
+ sae_network=True)
self.owe_2g = self.owe_networks[0]["2g"]
self.owe_5g = self.owe_networks[0]["5g"]
- self.wpa3_personal_2g = self.wpa3_personal[0]["2g"]
- self.wpa3_personal_5g = self.wpa3_personal[0]["5g"]
+ self.wpa3_personal_2g = self.sae_networks[0]["2g"]
+ self.wpa3_personal_5g = self.sae_networks[0]["5g"]
def setup_test(self):
super().setup_test()
@@ -72,32 +62,22 @@
wutils.reset_wifi(self.dut)
wutils.reset_wifi(self.dut_client)
- """Helper Functions"""
-
- """Tests"""
+ ### Test cases ###
@test_tracker_info(uuid="a7755f1f-5740-4d45-8c29-3711172b1bd7")
def test_connect_to_owe_2g(self):
- wutils.start_wifi_connection_scan_and_ensure_network_found(self.dut,
- self.owe_2g[WifiEnums.SSID_KEY])
- wutils.connect_to_wifi_network(self.dut, self.owe_2g )
+ wutils.connect_to_wifi_network(self.dut, self.owe_2g)
@test_tracker_info(uuid="9977765e-03da-4614-ab96-4c1597101118")
def test_connect_to_owe_5g(self):
- wutils.start_wifi_connection_scan_and_ensure_network_found(self.dut,
- self.owe_5g[WifiEnums.SSID_KEY])
wutils.connect_to_wifi_network(self.dut, self.owe_5g)
@test_tracker_info(uuid="3670702a-3d78-4184-b5e1-7fcf5fa48fd8")
def test_connect_to_wpa3_personal_2g(self):
- wutils.start_wifi_connection_scan_and_ensure_network_found(self.dut,
- self.wpa3_personal_2g[WifiEnums.SSID_KEY])
wutils.connect_to_wifi_network(self.dut, self.wpa3_personal_2g)
@test_tracker_info(uuid="c4528eaf-7960-4ecd-8f11-d5439bdf1c58")
def test_connect_to_wpa3_personal_5g(self):
- wutils.start_wifi_connection_scan_and_ensure_network_found(self.dut,
- self.wpa3_personal_5g[WifiEnums.SSID_KEY])
wutils.connect_to_wifi_network(self.dut, self.wpa3_personal_5g)
@test_tracker_info(uuid="a8fb46be-3487-4dc8-a393-5af992b27f45")
@@ -111,10 +91,6 @@
4. Initial connect request fails
Second connect request from framework succeeds.
"""
- wutils.start_wifi_connection_scan_and_ensure_network_found(self.dut,
- self.wpa3_personal_2g[WifiEnums.SSID_KEY])
wutils.connect_to_wifi_network(self.dut, self.wpa3_personal_2g)
wutils.toggle_wifi_off_and_on(self.dut)
- wutils.start_wifi_connection_scan_and_ensure_network_found(self.dut,
- self.wpa3_personal_2g[WifiEnums.SSID_KEY])
wutils.connect_to_wifi_network(self.dut, self.wpa3_personal_2g)
diff --git a/acts/tests/google/wifi/rtt/functional/RttDisableTest.py b/acts/tests/google/wifi/rtt/functional/RttDisableTest.py
index e3219d4..703efac 100644
--- a/acts/tests/google/wifi/rtt/functional/RttDisableTest.py
+++ b/acts/tests/google/wifi/rtt/functional/RttDisableTest.py
@@ -30,6 +30,9 @@
MODE_ENABLE_DOZE = 1
MODE_DISABLE_LOCATIONING = 2
+ def setup_test(self):
+ RttBaseTest.setup_test(self)
+
def setup_class(self):
super().setup_class()
if "AccessPoint" in self.user_params:
