commit 28df18448b5ece6055aafc2a7e9f313d770d7bba
author Jakub Pawlowski <jpawlowski@google.com> Fri Jun 03 10:15:33 2016 -0700
committer tturney <tturney@google.com> Wed Jul 13 10:56:51 2016 -0700
tree b1422a489b854d3d4e7bdc9c9084b348b1698944
parent ee70764743a64d1d889b53710c6d6701d804a521

Make write_characteristic_test PASS

Change-Id: Ie11a59610993134e428e23f722647f217a8fd005
(cherry picked from commit a6852c3d626e5f435bf08a4aa2981c96b9bf4801)

acts/tests/google/ble/gatt/GattConnectTest.py

diff --git a/acts/tests/google/ble/gatt/GattConnectTest.py b/acts/tests/google/ble/gatt/GattConnectTest.py
index e89f8a1..a0fa7b8 100644
--- a/acts/tests/google/ble/gatt/GattConnectTest.py
+++ b/acts/tests/google/ble/gatt/GattConnectTest.py
@@ -798,20 +798,12 @@
 
         service_uuid = "3846D7A0-69C8-11E4-BA00-0002A5D5C51B"
         characteristic_uuid = "aa7edd5a-4d1d-4f0e-883a-d145616a1630"
-        descriptor_uuid = "aa7edd5a-4d1d-4f0e-883a-d145616a1630"
 
         characteristic = (
             self.per_ad.droid.gattServerCreateBluetoothGattCharacteristic(
                 characteristic_uuid, GattCharacteristic.PROPERTY_WRITE.value,
                 GattCharacteristic.PERMISSION_WRITE.value))
 
-        descriptor = self.per_ad.droid.gattServerCreateBluetoothGattDescriptor(
-            descriptor_uuid,
-            GattDescriptor.PERMISSION_READ.value
-            | GattDescriptor.PERMISSION_WRITE.value, )
-        self.per_ad.droid.gattServerCharacteristicAddDescriptor(characteristic,
-                                                                descriptor)
-
         gatt_service = self.per_ad.droid.gattServerCreateService(
             service_uuid, GattService.SERVICE_TYPE_PRIMARY.value)
 
@@ -848,10 +840,6 @@
                 disc_service_index = i
                 break
 
-        self.cen_ad.droid.gattClientSetCharacteristicNotification(
-            gatt_callback, discovered_services_index, disc_service_index,
-            characteristic_uuid, True)
-
         test_value = "1,2,3,4,5,6,7"
         self.cen_ad.droid.gattClientCharacteristicSetValue(
             bluetooth_gatt, discovered_services_index, disc_service_index,
@@ -873,7 +861,7 @@
 
         request_id = event['data']['requestId']
         bt_device_id = 0
-        status = 1
+        status = 0
         offset = 1
         test_value_return = "1,2,3"
         self.per_ad.droid.gattServerGetConnectedDevices(gatt_server)
@@ -881,12 +869,15 @@
                                                  request_id, status, offset,
                                                  test_value_return)
 
+        expected_event = GattCbStrings.CHAR_WRITE.value.format(gatt_callback)
         try:
-            self.cen_ad.ed.pop_event(
-                GattCbStrings.CHAR_WRITE_REQ.value.format(bluetooth_gatt),
-                self.default_timeout)
+            event = self.cen_ad.ed.pop_event(expected_event, self.default_timeout)
+            if event["data"]["Status"] != status:
+                self.log.error("Write status should be 0")
+                return False;
+
         except Empty:
-            self.log.error(GattCbErr.CHAR_WRITE_REQ_ERR.value.format(
+            self.log.error(GattCbErr.CHAR_WRITE_ERR.value.format(
                 expected_event))
             return False
         return True