diff options
| author | “Sandy <fus@google.com> | 2022-05-25 07:26:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-25 07:26:35 +0000 |
| commit | 9a32e5402c7cc8e4fe2cd66ddaafdd8ce64d3db6 (patch) | |
| tree | 9a8341fa3ee06d9b23638cf7f91d708d515be4d4 | |
| parent | 8e86bf515e74ed8d0d8f0303d01ca43f9fe6be38 (diff) | |
| parent | 62843c103415980d0cf4fbca491e4ec399c43f99 (diff) | |
| download | connectivity-9a32e5402c7cc8e4fe2cd66ddaafdd8ce64d3db6.tar.gz | |
The change on Wifi_Base and Wifi_utils is for Country code testing am: 62843c1034
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/connectivity/+/18482700
Change-Id: I32a712c62cd708f2e9f568256b99b1fceca17723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py | 5 | ||||
| -rwxr-xr-x | acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py b/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py index 1f8085816..1c764013c 100644 --- a/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py +++ b/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py @@ -39,6 +39,7 @@ from acts.keys import Config from acts_contrib.test_utils.net import net_test_utils as nutils from acts_contrib.test_utils.wifi import wifi_test_utils as wutils +WifiEnums = wutils.WifiEnums AP_1 = 0 AP_2 = 1 MAX_AP_COUNT = 2 @@ -80,7 +81,9 @@ class WifiBaseTest(BaseTestClass): self.country_code_file) self.country_code = utils.load_config( self.country_code_file)["country"] - wutils.set_wifi_country_code(ad, self.country_code) + else: + self.country_code = WifiEnums.CountryCode.US + wutils.set_wifi_country_code(ad, self.country_code) def setup_test(self): if (hasattr(self, "android_devices") diff --git a/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py b/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py index d9ed9c0be..656bdbe26 100755 --- a/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py +++ b/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py @@ -811,7 +811,7 @@ def wifi_forget_network(ad, net_ssid): break -def wifi_test_device_init(ad): +def wifi_test_device_init(ad, country_code=WifiEnums.CountryCode.US): """Initializes an android device for wifi testing. 0. Make sure SL4A connection is established on the android device. @@ -842,7 +842,7 @@ def wifi_test_device_init(ad): ad.log.info("wpa_supplicant log change status: %s", output) utils.sync_device_time(ad) ad.droid.telephonyToggleDataConnection(False) - set_wifi_country_code(ad, WifiEnums.CountryCode.US) + set_wifi_country_code(ad, country_code) utils.set_ambient_display(ad, False) |