diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-07 23:13:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-07 23:13:36 +0000 |
| commit | ed82fc4cf32d0f38de251e33cb331b7a7a7a96b0 (patch) | |
| tree | 8f0878f7b3af395f409248e58df6e3cf2a8bd122 | |
| parent | fccab32d03474e0080959e78e79d5b2da02871c6 (diff) | |
| parent | ba99e8cb088f8dbf11f62c68eb2d6b4be7b34f37 (diff) | |
| download | platform_tools_test_connectivity-ed82fc4cf32d0f38de251e33cb331b7a7a7a96b0.tar.gz platform_tools_test_connectivity-ed82fc4cf32d0f38de251e33cb331b7a7a7a96b0.tar.bz2 platform_tools_test_connectivity-ed82fc4cf32d0f38de251e33cb331b7a7a7a96b0.zip | |
Merge "Reduce max_concurrent_scans and max_concurrent_scans, remove unused instances" into pi-dev
7 files changed, 3 insertions, 7 deletions
diff --git a/acts/tests/google/ble/bt5/AdvertisingSetTest.py b/acts/tests/google/ble/bt5/AdvertisingSetTest.py index 4427bb530b..0f0c352f0e 100644 --- a/acts/tests/google/ble/bt5/AdvertisingSetTest.py +++ b/acts/tests/google/ble/bt5/AdvertisingSetTest.py @@ -43,7 +43,6 @@ from acts import signals class AdvertisingSetTest(BluetoothBaseTest): default_timeout = 10 - max_scan_instances = 28 report_delay = 2000 scan_callbacks = [] adv_callbacks = [] diff --git a/acts/tests/google/ble/bt5/Bt5ScanTest.py b/acts/tests/google/ble/bt5/Bt5ScanTest.py index 7f7b7dcd0d..633489f038 100644 --- a/acts/tests/google/ble/bt5/Bt5ScanTest.py +++ b/acts/tests/google/ble/bt5/Bt5ScanTest.py @@ -41,7 +41,6 @@ from acts import signals class Bt5ScanTest(BluetoothBaseTest): default_timeout = 10 - max_scan_instances = 28 report_delay = 2000 scan_callbacks = [] adv_callbacks = [] diff --git a/acts/tests/google/ble/concurrency/ConcurrentBleScanningTest.py b/acts/tests/google/ble/concurrency/ConcurrentBleScanningTest.py index 24e078afdc..1972806c80 100644 --- a/acts/tests/google/ble/concurrency/ConcurrentBleScanningTest.py +++ b/acts/tests/google/ble/concurrency/ConcurrentBleScanningTest.py @@ -37,7 +37,7 @@ from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs class ConcurrentBleScanningTest(BluetoothBaseTest): default_timeout = 20 - max_concurrent_scans = 28 + max_concurrent_scans = 27 def __init__(self, controllers): BluetoothBaseTest.__init__(self, controllers) diff --git a/acts/tests/google/ble/scan/BleBackgroundScanTest.py b/acts/tests/google/ble/scan/BleBackgroundScanTest.py index cf6afc1029..55fb86b722 100644 --- a/acts/tests/google/ble/scan/BleBackgroundScanTest.py +++ b/acts/tests/google/ble/scan/BleBackgroundScanTest.py @@ -39,7 +39,6 @@ import time class BleBackgroundScanTest(BluetoothBaseTest): default_timeout = 10 - max_scan_instances = 28 report_delay = 2000 scan_callbacks = [] adv_callbacks = [] diff --git a/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py b/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py index 0896c6d594..cdca99cd7a 100644 --- a/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py +++ b/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py @@ -36,7 +36,6 @@ from acts.test_utils.bt.bt_constants import scan_result class BleOnLostOnFoundTest(BluetoothBaseTest): default_timeout = 10 - max_scan_instances = 28 active_scan_callback_list = [] active_adv_callback_list = [] diff --git a/acts/tests/google/ble/scan/BleOpportunisticScanTest.py b/acts/tests/google/ble/scan/BleOpportunisticScanTest.py index d407723400..e907cbb342 100644 --- a/acts/tests/google/ble/scan/BleOpportunisticScanTest.py +++ b/acts/tests/google/ble/scan/BleOpportunisticScanTest.py @@ -38,7 +38,7 @@ from acts.test_utils.bt.bt_constants import scan_result class BleOpportunisticScanTest(BluetoothBaseTest): default_timeout = 10 - max_scan_instances = 28 + max_scan_instances = 27 report_delay = 2000 scan_callbacks = [] adv_callbacks = [] diff --git a/acts/tests/google/ble/scan/BleScanScreenStateTest.py b/acts/tests/google/ble/scan/BleScanScreenStateTest.py index 33cc758291..2593461efb 100644 --- a/acts/tests/google/ble/scan/BleScanScreenStateTest.py +++ b/acts/tests/google/ble/scan/BleScanScreenStateTest.py @@ -39,7 +39,7 @@ from acts.test_utils.bt.bt_test_utils import reset_bluetooth class BleScanScreenStateTest(BluetoothBaseTest): advertise_callback = -1 - max_concurrent_scans = 28 + max_concurrent_scans = 27 scan_callback = -1 shorter_scan_timeout = 2 |