summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-07-14 01:13:07 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-07-14 01:13:07 +0000
commit163a9ed03824d62b8f6b157bab22113f5ccf1d8f (patch)
treef35ba8abbf3d0f1f2851ef7af776cef01adc1fbf
parente82d92e7669f9ae26cdde6f6126203eb798051e6 (diff)
parent585ed8217f1036fff15e1dde1a3b94250b1a06da (diff)
downloadplatform_tools_test_connectivity-163a9ed03824d62b8f6b157bab22113f5ccf1d8f.tar.gz
platform_tools_test_connectivity-163a9ed03824d62b8f6b157bab22113f5ccf1d8f.tar.bz2
platform_tools_test_connectivity-163a9ed03824d62b8f6b157bab22113f5ccf1d8f.zip
Snap for 6676900 from 585ed8217f1036fff15e1dde1a3b94250b1a06da to rvc-release
Change-Id: Ibc4425deb67b6818737ea0ee1e1ade1a1baac485
-rwxr-xr-xacts/framework/acts/test_utils/wifi/wifi_test_utils.py8
-rw-r--r--acts/tests/google/wifi/WifiRoamingTest.py9
2 files changed, 10 insertions, 7 deletions
diff --git a/acts/framework/acts/test_utils/wifi/wifi_test_utils.py b/acts/framework/acts/test_utils/wifi/wifi_test_utils.py
index f252bf9cb6..167daf6cd8 100755
--- a/acts/framework/acts/test_utils/wifi/wifi_test_utils.py
+++ b/acts/framework/acts/test_utils/wifi/wifi_test_utils.py
@@ -54,12 +54,12 @@ ROAMING_ATTN = {
"AP1_on_AP2_off": [
0,
0,
- 60,
- 60
+ 95,
+ 95
],
"AP1_off_AP2_on": [
- 60,
- 60,
+ 95,
+ 95,
0,
0
],
diff --git a/acts/tests/google/wifi/WifiRoamingTest.py b/acts/tests/google/wifi/WifiRoamingTest.py
index d7bec90f0e..b0f1a71f7f 100644
--- a/acts/tests/google/wifi/WifiRoamingTest.py
+++ b/acts/tests/google/wifi/WifiRoamingTest.py
@@ -62,6 +62,7 @@ class WifiRoamingTest(WifiBaseTest):
len(self.open_network) > 1,
"Need at least two open networks for roaming")
+
self.configure_packet_capture()
def teardown_class(self):
@@ -101,10 +102,12 @@ class WifiRoamingTest(WifiBaseTest):
5. Validate connection information and ping.
"""
wutils.set_attns(self.attenuators, "AP1_on_AP2_off")
- wutils.connect_to_wifi_network(self.dut, AP1_network)
+ wifi_config = AP1_network.copy()
+ wifi_config.pop("bssid")
+ wutils.connect_to_wifi_network(self.dut, wifi_config)
self.log.info("Roaming from %s to %s", AP1_network, AP2_network)
- self.trigger_roaming_and_verify_attenuation(AP1_network)
- self.validate_roaming(AP2_network)
+ wutils.trigger_roaming_and_validate(
+ self.dut, self.attenuators, "AP1_off_AP2_on", AP2_network)
def get_rssi(self, pcap_file, expected_bssid):
"""Get signal strength of the wifi network attenuated.