commit ed82fc4cf32d0f38de251e33cb331b7a7a7a96b0
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 07 23:13:36 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 07 23:13:36 2018 +0000
tree 8f0878f7b3af395f409248e58df6e3cf2a8bd122
parent fccab32d03474e0080959e78e79d5b2da02871c6
parent ba99e8cb088f8dbf11f62c68eb2d6b4be7b34f37

Merge "Reduce max_concurrent_scans and max_concurrent_scans, remove unused instances" into pi-dev

acts/tests/google/ble/bt5/AdvertisingSetTest.py

diff --git a/acts/tests/google/ble/bt5/AdvertisingSetTest.py b/acts/tests/google/ble/bt5/AdvertisingSetTest.py
index 4427bb5..0f0c352 100644
--- a/acts/tests/google/ble/bt5/AdvertisingSetTest.py
+++ b/acts/tests/google/ble/bt5/AdvertisingSetTest.py
@@ -43,7 +43,6 @@
 
 class AdvertisingSetTest(BluetoothBaseTest):
     default_timeout = 10
-    max_scan_instances = 28
     report_delay = 2000
     scan_callbacks = []
     adv_callbacks = []

acts/tests/google/ble/bt5/Bt5ScanTest.py

diff --git a/acts/tests/google/ble/bt5/Bt5ScanTest.py b/acts/tests/google/ble/bt5/Bt5ScanTest.py
index 7f7b7dc..633489f 100644
--- a/acts/tests/google/ble/bt5/Bt5ScanTest.py
+++ b/acts/tests/google/ble/bt5/Bt5ScanTest.py
@@ -41,7 +41,6 @@
 
 class Bt5ScanTest(BluetoothBaseTest):
     default_timeout = 10
-    max_scan_instances = 28
     report_delay = 2000
     scan_callbacks = []
     adv_callbacks = []

acts/tests/google/ble/concurrency/ConcurrentBleScanningTest.py

diff --git a/acts/tests/google/ble/concurrency/ConcurrentBleScanningTest.py b/acts/tests/google/ble/concurrency/ConcurrentBleScanningTest.py
index 24e078a..1972806 100644
--- a/acts/tests/google/ble/concurrency/ConcurrentBleScanningTest.py
+++ b/acts/tests/google/ble/concurrency/ConcurrentBleScanningTest.py
@@ -37,7 +37,7 @@
 
 class ConcurrentBleScanningTest(BluetoothBaseTest):
     default_timeout = 20
-    max_concurrent_scans = 28
+    max_concurrent_scans = 27
 
     def __init__(self, controllers):
         BluetoothBaseTest.__init__(self, controllers)

acts/tests/google/ble/scan/BleBackgroundScanTest.py

diff --git a/acts/tests/google/ble/scan/BleBackgroundScanTest.py b/acts/tests/google/ble/scan/BleBackgroundScanTest.py
index cf6afc1..55fb86b 100644
--- a/acts/tests/google/ble/scan/BleBackgroundScanTest.py
+++ b/acts/tests/google/ble/scan/BleBackgroundScanTest.py
@@ -39,7 +39,6 @@
 
 class BleBackgroundScanTest(BluetoothBaseTest):
     default_timeout = 10
-    max_scan_instances = 28
     report_delay = 2000
     scan_callbacks = []
     adv_callbacks = []

acts/tests/google/ble/scan/BleOnLostOnFoundTest.py

diff --git a/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py b/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py
index 0896c6d..cdca99c 100644
--- a/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py
+++ b/acts/tests/google/ble/scan/BleOnLostOnFoundTest.py
@@ -36,7 +36,6 @@
 
 class BleOnLostOnFoundTest(BluetoothBaseTest):
     default_timeout = 10
-    max_scan_instances = 28
     active_scan_callback_list = []
     active_adv_callback_list = []
 

acts/tests/google/ble/scan/BleOpportunisticScanTest.py

diff --git a/acts/tests/google/ble/scan/BleOpportunisticScanTest.py b/acts/tests/google/ble/scan/BleOpportunisticScanTest.py
index d407723..e907cbb 100644
--- a/acts/tests/google/ble/scan/BleOpportunisticScanTest.py
+++ b/acts/tests/google/ble/scan/BleOpportunisticScanTest.py
@@ -38,7 +38,7 @@
 
 class BleOpportunisticScanTest(BluetoothBaseTest):
     default_timeout = 10
-    max_scan_instances = 28
+    max_scan_instances = 27
     report_delay = 2000
     scan_callbacks = []
     adv_callbacks = []

acts/tests/google/ble/scan/BleScanScreenStateTest.py

diff --git a/acts/tests/google/ble/scan/BleScanScreenStateTest.py b/acts/tests/google/ble/scan/BleScanScreenStateTest.py
index 33cc758..2593461 100644
--- a/acts/tests/google/ble/scan/BleScanScreenStateTest.py
+++ b/acts/tests/google/ble/scan/BleScanScreenStateTest.py
@@ -39,7 +39,7 @@
 
 class BleScanScreenStateTest(BluetoothBaseTest):
     advertise_callback = -1
-    max_concurrent_scans = 28
+    max_concurrent_scans = 27
     scan_callback = -1
     shorter_scan_timeout = 2