summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-09-26 03:29:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-26 03:29:30 +0000
commit44833c9859087dd548c6a415abe527f6800dcedd (patch)
treed946a142ee699d2a3e22bb8f3515fff583c651e2
parentb9d79868b186878596519f6956568c3cb2bccba4 (diff)
parent1ed229c73c99f76a8db1762a03982608000fa231 (diff)
downloadconnectivity-android-11.0.0_r30.tar.gz
Merge "[ACTS]Fix WiFiAutoUpdateTest updated failed from Android R to Android R" into rvc-dev am: 9716849f3c am: 1ed229c73candroid-11.0.0_r30android11-qpr1-c-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/connectivity/+/12696984 Change-Id: Ib0ae022242a6d9304b7e109f433f54de21c2bf10
-rwxr-xr-xacts/tests/google/wifi/WifiAutoUpdateTest.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/acts/tests/google/wifi/WifiAutoUpdateTest.py b/acts/tests/google/wifi/WifiAutoUpdateTest.py
index 8e20c81dd..4ce81d9bf 100755
--- a/acts/tests/google/wifi/WifiAutoUpdateTest.py
+++ b/acts/tests/google/wifi/WifiAutoUpdateTest.py
@@ -126,7 +126,18 @@ class WifiAutoUpdateTest(WifiBaseTest):
self.wifi_hotspot = {"SSID": "hotspot_%s" % utils.rand_ascii_str(6),
"password": "pass_%s" % utils.rand_ascii_str(6)}
band = WIFI_CONFIG_APBAND_5G
- if self.dut.build_info["build_id"].startswith("Q"):
+ if self.dut.build_info["build_id"].startswith("R"):
+ band = WifiEnums.WIFI_CONFIG_SOFTAP_BAND_5G
+ self.wifi_hotspot[WifiEnums.AP_BAND_KEY] = band
+ asserts.assert_true(
+ self.dut.droid.wifiSetWifiApConfiguration(self.wifi_hotspot),
+ "Failed to set WifiAp Configuration")
+ wifi_ap = self.dut.droid.wifiGetApConfiguration()
+ asserts.assert_true(
+ wifi_ap[WifiEnums.SSID_KEY] == self.wifi_hotspot[WifiEnums.SSID_KEY],
+ "Hotspot SSID doesn't match with expected SSID")
+ return
+ elif self.dut.build_info["build_id"].startswith("Q"):
band = WifiEnums.WIFI_CONFIG_APBAND_5G_OLD
self.wifi_hotspot[WifiEnums.AP_BAND_KEY] = band
asserts.assert_true(