diff options
| author | Bindu Mahadev <bmahadev@google.com> | 2018-07-16 12:08:35 -0700 |
|---|---|---|
| committer | Girish Moturu <gmoturu@google.com> | 2018-07-17 14:48:46 -0700 |
| commit | d265b2eda336fa3e2162592033aac9f630b0f32a (patch) | |
| tree | 718be119c7f97d4119bca7fd622483d8357628fc | |
| parent | 3a14a288e9c40cddb5d8f3875e1798adb6adcf84 (diff) | |
| download | platform_tools_test_connectivity-pie-dr1-dev.tar.gz platform_tools_test_connectivity-pie-dr1-dev.tar.bz2 platform_tools_test_connectivity-pie-dr1-dev.zip | |
[WifiBaseTest]Correcting condition to raise AP value error.pie-dr1-dev
This change is not merged to pi-dev and as a result
pi-dr1-release runs fail
CHERRY PICKED FROM AOSP
Bug: 111500771
Bug: 111502276
Test: Local
Change-Id: I62c1363013829817b5c20c125f30362bf04a9ad9
Merged-In: I6af55fe0faffbfa7726d4439d32972ca8f92769d
| -rwxr-xr-x | acts/framework/acts/controllers/access_point.py | 1 | ||||
| -rwxr-xr-x | acts/framework/acts/test_utils/wifi/WifiBaseTest.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/acts/framework/acts/controllers/access_point.py b/acts/framework/acts/controllers/access_point.py index 70a81bb26e..313fcf999d 100755 --- a/acts/framework/acts/controllers/access_point.py +++ b/acts/framework/acts/controllers/access_point.py @@ -26,6 +26,7 @@ from acts.controllers.ap_lib import dhcp_config from acts.controllers.ap_lib import dhcp_server from acts.controllers.ap_lib import hostapd from acts.controllers.ap_lib import hostapd_config +from acts.controllers.ap_lib import hostapd_constants from acts.controllers.utils_lib.commands import ip from acts.controllers.utils_lib.commands import route from acts.controllers.utils_lib.commands import shell diff --git a/acts/framework/acts/test_utils/wifi/WifiBaseTest.py b/acts/framework/acts/test_utils/wifi/WifiBaseTest.py index fe72deddb7..4b6dc8c50e 100755 --- a/acts/framework/acts/test_utils/wifi/WifiBaseTest.py +++ b/acts/framework/acts/test_utils/wifi/WifiBaseTest.py @@ -261,8 +261,10 @@ class WifiBaseTest(BaseTestClass): config_count = 1 count = 0 - if mirror_ap and ap_count == 1: - raise ValueError("ap_count cannot be 1 if mirror_ap is True.") + # For example, the NetworkSelector tests use 2 APs and require that + # both APs are not mirrored. + if not mirror_ap and ap_count == 1: + raise ValueError("ap_count cannot be 1 if mirror_ap is False.") if not mirror_ap: config_count = ap_count |