Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: third_party/WebKit/LayoutTests/bluetooth/characteristic/getDescriptor/gen-descriptor-garbage-collection-ran-during-error.html

Issue 2728813002: bluetooth: Improve error message for retrieving Descriptors when disconnecting (Closed)
Patch Set: Fix conflict error Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/LayoutTests/bluetooth/characteristic/getDescriptor/gen-descriptor-garbage-collection-ran-during-error.html
diff --git a/third_party/WebKit/LayoutTests/bluetooth/characteristic/getDescriptor/gen-descriptor-garbage-collection-ran-during-error.html b/third_party/WebKit/LayoutTests/bluetooth/characteristic/getDescriptor/gen-descriptor-garbage-collection-ran-during-error.html
index 2910e06b180fb8bf983b556ba827cd9087b77bf4..3ed0e2eba5af528f9b9144ef59d47b53b3b8632c 100644
--- a/third_party/WebKit/LayoutTests/bluetooth/characteristic/getDescriptor/gen-descriptor-garbage-collection-ran-during-error.html
+++ b/third_party/WebKit/LayoutTests/bluetooth/characteristic/getDescriptor/gen-descriptor-garbage-collection-ran-during-error.html
@@ -8,25 +8,26 @@
promise_test(() => {
let promise;
return setBluetoothFakeAdapter('DisconnectingHealthThermometerAdapter')
- .then(() => requestDeviceWithKeyDown({
- filters: [{services: ['health_thermometer']}]}))
- .then(device => device.gatt.connect())
- .then(gattServer => gattServer.getPrimaryService('health_thermometer'))
- .then(service => service.getCharacteristic('measurement_interval'))
- .then(characteristic => {
- promise = assert_promise_rejects_with_message(
- /* 0x0101 doesn't exist in this characteristic */
- characteristic.getDescriptor(0x0101),
- new DOMException(
- 'GATT Server is disconnected. Cannot perform GATT operations. ' +
- '(Re)connect first with `device.gatt.connect`.',
- 'NetworkError'));
- // Disconnect called to clear attributeInstanceMap and allow the
- // object to get garbage collected.
- characteristic.service.device.gatt.disconnect();
- })
- .then(runGarbageCollection)
- .then(() => promise);
+ .then(
+ () => requestDeviceWithKeyDown(
+ {filters: [{services: ['health_thermometer']}]}))
+ .then(device => device.gatt.connect())
+ .then(gattServer => gattServer.getPrimaryService('health_thermometer'))
+ .then(service => service.getCharacteristic('measurement_interval'))
+ .then(characteristic => {
+ promise = assert_promise_rejects_with_message(
+ /* 0x0101 doesn't exist in this characteristic */
+ characteristic.getDescriptor(0x0101),
+ new DOMException(
+ 'GATT Server is disconnected. Cannot retrieve descriptors. ' +
+ '(Re)connect first with `device.gatt.connect`.',
+ 'NetworkError'));
+ // Disconnect called to clear attributeInstanceMap and allow the
+ // object to get garbage collected.
+ characteristic.service.device.gatt.disconnect();
+ })
+ .then(runGarbageCollection)
+ .then(() => promise);
}, 'Garbage Collection ran during getDescriptor call that fails. ' +
'Should not crash');

Powered by Google App Engine
This is Rietveld 408576698