diff options
| author | Sandy Fu <fus@google.com> | 2022-05-27 12:24:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-27 12:24:43 +0000 |
| commit | 5e04e4e97b69446fc9776d8d214faf0aae9fb759 (patch) | |
| tree | 28dd89d91c42d2f2ba8b7bc50263417c95634a57 | |
| parent | 5abd19732ba09ab83667a3571b4af9dcd18525e4 (diff) | |
| parent | 6f04e88225614758ff108098b5569d78eec59091 (diff) | |
| download | connectivity-5e04e4e97b69446fc9776d8d214faf0aae9fb759.tar.gz | |
Revert "The change on Wifi_Base and Wifi_utils is for Country code testing" am: 6f04e88225
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/connectivity/+/18618767
Change-Id: I90fc952fba4e725d742945eb2177842587c90a15
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, 3 insertions, 6 deletions
diff --git a/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py b/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py index 1c764013c..1f8085816 100644 --- a/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py +++ b/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py @@ -39,7 +39,6 @@ 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 @@ -81,9 +80,7 @@ class WifiBaseTest(BaseTestClass): self.country_code_file) self.country_code = utils.load_config( self.country_code_file)["country"] - else: - self.country_code = WifiEnums.CountryCode.US - wutils.set_wifi_country_code(ad, self.country_code) + 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 656bdbe26..d9ed9c0be 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, country_code=WifiEnums.CountryCode.US): +def wifi_test_device_init(ad): """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, country_code=WifiEnums.CountryCode.US): ad.log.info("wpa_supplicant log change status: %s", output) utils.sync_device_time(ad) ad.droid.telephonyToggleDataConnection(False) - set_wifi_country_code(ad, country_code) + set_wifi_country_code(ad, WifiEnums.CountryCode.US) utils.set_ambient_display(ad, False) |