Merge "Fix for device setup pairing inconsistency" into pi-dev
diff --git a/acts/tests/google/ble/scan/BleBackgroundScanTest.py b/acts/tests/google/ble/scan/BleBackgroundScanTest.py
index 3cb2842..9a20ed6 100644
--- a/acts/tests/google/ble/scan/BleBackgroundScanTest.py
+++ b/acts/tests/google/ble/scan/BleBackgroundScanTest.py
@@ -100,8 +100,8 @@
"""
self.scn_ad.droid.bluetoothEnableBLE()
self._setup_generic_advertisement()
- self.scn_ad.droid.bleSetScanSettingsScanMode(ble_scan_settings_modes[
- 'low_latency'])
+ self.scn_ad.droid.bleSetScanSettingsScanMode(
+ ble_scan_settings_modes['low_latency'])
filter_list, scan_settings, scan_callback = generate_ble_scan_objects(
self.scn_ad.droid)
self.scn_ad.droid.bleSetScanFilterDeviceName(
@@ -152,8 +152,8 @@
"""
self._setup_generic_advertisement()
self.scn_ad.droid.bluetoothEnableBLE()
- self.scn_ad.droid.bleSetScanSettingsScanMode(ble_scan_settings_modes[
- 'low_latency'])
+ self.scn_ad.droid.bleSetScanSettingsScanMode(
+ ble_scan_settings_modes['low_latency'])
filter_list, scan_settings, scan_callback = generate_ble_scan_objects(
self.scn_ad.droid)
self.scn_ad.droid.bleSetScanFilterDeviceName(
@@ -174,8 +174,9 @@
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))
+ self.log.error(
+ "Scan Result event not found. Expected {}".format(
+ expected_event))
return False
except Exception:
self.log.info(
@@ -213,6 +214,7 @@
"""
ble_state_error_msg = "Bluetooth LE State not OK {}. Expected {} got {}"
# Enable BLE always available (effectively enabling BT in location)
+ self.scn_ad.shell.enable_ble_scanning()
self.scn_ad.droid.bluetoothEnableBLE()
self.scn_ad.droid.bluetoothToggleState(False)
try:
@@ -237,8 +239,9 @@
try:
self.scn_ad.ed.pop_event(bluetooth_le_off, self.default_timeout)
except Empty:
- self.log.error("Bluetooth LE Off event not found. Expected {}".
- format(bluetooth_le_off))
+ self.log.error(
+ "Bluetooth LE Off event not found. Expected {}".format(
+ bluetooth_le_off))
return False
state = self.scn_ad.droid.bluetoothGetLeState()
if state != bt_adapter_states['off']:
diff --git a/acts/tests/google/bt/car_bt/BtCarPairingTest.py b/acts/tests/google/bt/car_bt/BtCarPairingTest.py
index 09810d1..f28ca83 100644
--- a/acts/tests/google/bt/car_bt/BtCarPairingTest.py
+++ b/acts/tests/google/bt/car_bt/BtCarPairingTest.py
@@ -38,6 +38,12 @@
self.car = self.android_devices[0]
self.ph = self.android_devices[1]
+ def teardown_test(self):
+ for ad in self.android_devices:
+ bt_test_utils.clear_bonded_devices(ad)
+ # Give the stack time to unbond.
+ time.sleep(UNBOND_TIMEOUT)
+
@test_tracker_info(uuid='f56e915-eef7-45cd-b5a6-771f6ef72602')
@BluetoothBaseTest.bt_test_wrap
def test_simple_pairing(self):