Change country code for specific 5g channel on OpenWrt am: 4601e649fb
Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/2807713
Change-Id: Ib760e28c3fb3c81a8cbdbb634d416f2a9d200dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/acts_tests/tests/google/wifi/WifiBridgedApTest.py b/acts_tests/tests/google/wifi/WifiBridgedApTest.py
index d98a7cb..392fdc1 100644
--- a/acts_tests/tests/google/wifi/WifiBridgedApTest.py
+++ b/acts_tests/tests/google/wifi/WifiBridgedApTest.py
@@ -57,10 +57,7 @@
self.client1 = self.android_devices[1]
self.client2 = self.android_devices[2]
else:
- raise signals.TestAbortClass("WifiBridgedApTest requires 3 DUTs")
-
- if not self.dut.droid.wifiIsBridgedApConcurrencySupported():
- raise signals.TestAbortClass("Legacy phone is not supported")
+ raise signals.TestFailure("WifiBridgedApTest requires 3 DUTs")
req_params = ["dbs_supported_models"]
opt_param = []
@@ -70,6 +67,7 @@
def setup_test(self):
super().setup_test()
+ asserts.skip_if(not self.dut.droid.wifiIsBridgedApConcurrencySupported(), "Phone %s doesn't support bridged AP." % (self.dut.model))
for ad in self.android_devices:
wutils.reset_wifi(ad)
wutils.wifi_toggle_state(self.dut, False)
@@ -1332,4 +1330,4 @@
self.dut, [WifiEnums.WIFI_CONFIG_SOFTAP_BAND_2G,
WifiEnums.WIFI_CONFIG_SOFTAP_BAND_5G], False)
# Restore config
- wutils.save_wifi_soft_ap_config(self.dut, original_softap_config)
\ No newline at end of file
+ wutils.save_wifi_soft_ap_config(self.dut, original_softap_config)
