Cleanup/Fixes/Logging/Removed Workarounds
Renamed Spp* tests to Rfcomm* tests.
Removed various workaround for fixed bugs.
Improved Gatt connection stress tests.
Improved Gatt connection tests by splitting
out it's own utils and error messages.
Added additional logging to key Gatt connection
tests.
Removed self.tests to necessary areas as now
all tests are called.
Set the default advertising size to 1 for all
Android devices.
Change-Id: I6b2bb25ed0d6293206b29ac643dbac7319cfc5a4
diff --git a/acts/tests/google/ble/scan/BleBackgroundScanTest.py b/acts/tests/google/ble/scan/BleBackgroundScanTest.py
index 992f969..cc3df3a 100644
--- a/acts/tests/google/ble/scan/BleBackgroundScanTest.py
+++ b/acts/tests/google/ble/scan/BleBackgroundScanTest.py
@@ -32,7 +32,6 @@
class BleBackgroundScanTest(BluetoothBaseTest):
- tests = None
default_timeout = 10
max_scan_instances = 28
report_delay = 2000
@@ -49,8 +48,6 @@
if self.droid_list[1]['max_advertisements'] == 0:
self.tests = ()
return
- self.tests = ("test_background_scan",
- "test_background_scan_ble_disabled", )
def setup_test(self):
self.log.debug(log_energy_info(self.android_devices, "Start"))
@@ -86,10 +83,6 @@
self.log.info("No scan result found as expected.")
return True
- def _delete_me(self):
- import time
- time.sleep(5)
-
@BluetoothBaseTest.bt_test_wrap
def test_background_scan(self):
"""Test generic background scan.
@@ -117,18 +110,36 @@
import time
self._setup_generic_advertisement()
self.scn_ad.droid.bluetoothToggleState(False)
- self.scn_ad.ed.pop_event(bluetooth_off, self.default_timeout)
+ try:
+ self.scn_ad.ed.pop_event(bluetooth_off, self.default_timeout)
+ except Empty:
+ self.log.error("Bluetooth Off event not found. Expected {}".format(
+ bluetooth_off))
+ return False
self.scn_ad.droid.bluetoothDisableBLE()
- self.scn_ad.ed.pop_event(bluetooth_off, self.default_timeout)
+ try:
+ self.scn_ad.ed.pop_event(bluetooth_off, self.default_timeout)
+ except Empty:
+ self.log.error("Bluetooth Off event not found. Expected {}".format(
+ bluetooth_off))
+ return False
self.scn_ad.droid.bluetoothEnableBLE()
- self._delete_me()
- self.scn_ad.ed.pop_event(bluetooth_on, self.default_timeout * 2)
+ try:
+ self.scn_ad.ed.pop_event(bluetooth_off, self.default_timeout*2)
+ except Empty:
+ self.log.error("Bluetooth On event not found. Expected {}".format(
+ bluetooth_on))
+ return False
filter_list, scan_settings, scan_callback = generate_ble_scan_objects(
self.scn_ad.droid)
self.scn_ad.droid.bleStartBleScan(filter_list, scan_settings,
scan_callback)
- self.scn_ad.ed.pop_event(
- scan_result.format(scan_callback), self.default_timeout)
+ expected_event = scan_result.format(scan_callback)
+ try:
+ self.scn_ad.ed.pop_event(expected_event, self.default_timeout)
+ except Empty:
+ self.log.error("Scan Result event not found. Expected {}".format(expected_event))
+ return False
return True
@BluetoothBaseTest.bt_test_wrap
@@ -158,14 +169,23 @@
self._setup_generic_advertisement()
self.scn_ad.droid.bluetoothEnableBLE()
self.scn_ad.droid.bluetoothToggleState(False)
- self.scn_ad.ed.pop_event(bluetooth_off, self.default_timeout)
- self._delete_me()
+ try:
+ self.scn_ad.ed.pop_event(bluetooth_off, self.default_timeout)
+ except Empty:
+ self.log.error("Bluetooth Off event not found. Expected {}".format(
+ bluetooth_off))
+ return False
filter_list, scan_settings, scan_callback = generate_ble_scan_objects(
self.scn_ad.droid)
try:
self.scn_ad.droid.bleStartBleScan(filter_list, scan_settings,
scan_callback)
- self.scn_ad.ed.pop_event(scan_result.format(scan_callback))
+ expected_event = scan_result.format(scan_callback)
+ try:
+ self.scn_ad.ed.pop_event(expected_event, self.default_timeout)
+ except Empty:
+ self.log.error("Scan Result event not found. Expected {}".format(expected_event))
+ return False
self.log.info("Was able to start background scan even though ble "
"was disabled.")
return False