diff options
author | Xin Li <delphij@google.com> | 2023-12-08 13:14:40 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2023-12-08 13:14:40 -0800 |
commit | 0f3b2cb58bb74ccb7e7e9cf658d54af74d0fb844 (patch) | |
tree | 63ee8d8abb274927961e6ab75eee1cff9bc42ef4 | |
parent | 2ddb89173d1f9ab0004412fa155eb50292026d2a (diff) | |
parent | 23e713e6d372d08d7436bc2f89c4582fefdebd19 (diff) | |
download | connectivity-0f3b2cb58bb74ccb7e7e9cf658d54af74d0fb844.tar.gz |
Merge Android 14 QPR1
Merged-In: If557bc525cb6db48278c4f79b8aee12c7de40d5c
Bug: 315507370
Change-Id: I9b76dcb25a3b47be9ca9eb4d144d9bead7ca12c7
-rw-r--r-- | acts_tests/tests/google/wifi/WifiBridgedApTest.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/acts_tests/tests/google/wifi/WifiBridgedApTest.py b/acts_tests/tests/google/wifi/WifiBridgedApTest.py index d98a7cbf3..392fdc122 100644 --- a/acts_tests/tests/google/wifi/WifiBridgedApTest.py +++ b/acts_tests/tests/google/wifi/WifiBridgedApTest.py @@ -57,10 +57,7 @@ class WifiBridgedApTest(WifiBaseTest): 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 @@ class WifiBridgedApTest(WifiBaseTest): 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 @@ class WifiBridgedApTest(WifiBaseTest): 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) |