diff options
| author | Roshan Pius <rpius@google.com> | 2018-05-16 03:05:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-16 03:05:03 +0000 |
| commit | 5d1dbb0779d6f4b7d9797c12b67d96ec871a04e6 (patch) | |
| tree | 1fd7500c51756cf7d70f6b7ec67e968752fc064e | |
| parent | 87345aab94d04e498917ff4477c48824df8d6552 (diff) | |
| parent | 044ebed17342b5234f41f45d6a79971a8137a4e7 (diff) | |
| download | platform_tools_test_connectivity-5d1dbb0779d6f4b7d9797c12b67d96ec871a04e6.tar.gz platform_tools_test_connectivity-5d1dbb0779d6f4b7d9797c12b67d96ec871a04e6.tar.bz2 platform_tools_test_connectivity-5d1dbb0779d6f4b7d9797c12b67d96ec871a04e6.zip | |
Merge "WifiStaApConcurrencyTest: Fix a bug in setup" into pi-dev
| -rwxr-xr-x | acts/tests/google/wifi/WifiStaApConcurrencyTest.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/acts/tests/google/wifi/WifiStaApConcurrencyTest.py b/acts/tests/google/wifi/WifiStaApConcurrencyTest.py index ff55819215..6f0beba430 100755 --- a/acts/tests/google/wifi/WifiStaApConcurrencyTest.py +++ b/acts/tests/google/wifi/WifiStaApConcurrencyTest.py @@ -53,10 +53,6 @@ class WifiStaApConcurrencyTest(WifiBaseTest): self.dut_client = self.android_devices[1] wutils.wifi_test_device_init(self.dut) wutils.wifi_test_device_init(self.dut_client) - if self.dut.model not in self.dbs_supported_models: - asserts.skip( - ("Device %s does not support dual interfaces.") - % self.dut.model) # Do a simple version of init - mainly just sync the time and enable # verbose logging. This test will fail if the DUT has a sim and cell # data is disabled. We would also like to test with phones in less @@ -76,11 +72,16 @@ class WifiStaApConcurrencyTest(WifiBaseTest): asserts.assert_equal(self.dut_client.droid.wifiGetVerboseLoggingLevel(), 1, "Failed to enable WiFi verbose logging on the client dut.") - req_params = ["AccessPoint"] + req_params = ["AccessPoint", "dbs_supported_models"] opt_param = ["iperf_server_address"] self.unpack_userparams( req_param_names=req_params, opt_param_names=opt_param) + if self.dut.model not in self.dbs_supported_models: + asserts.skip( + ("Device %s does not support dual interfaces.") + % self.dut.model) + if "iperf_server_address" in self.user_params: self.iperf_server = self.iperf_servers[0] if hasattr(self, 'iperf_server'): |