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

Unified Diff: third_party/WebKit/LayoutTests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.html

Issue 2652163002: bluetooth: Improve GATT disconnected error message. (Closed)
Patch Set: Merge TOT Created 3 years, 11 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/server/getPrimaryService/gen-garbage-collection-ran-during-error.html
diff --git a/third_party/WebKit/LayoutTests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.html b/third_party/WebKit/LayoutTests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.html
index 8805e1caac970d1182b08c8420b08421171875cf..42d9af2e1d3361549861b62c9461b5d19ee2c4ed 100644
--- a/third_party/WebKit/LayoutTests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.html
+++ b/third_party/WebKit/LayoutTests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.html
@@ -8,21 +8,24 @@
promise_test(() => {
let promise;
return setBluetoothFakeAdapter('MissingServiceHeartRateAdapter')
- .then(() => requestDeviceWithKeyDown({
- filters: [{services: ['heart_rate']}]}))
- .then(device => device.gatt.connect())
- .then(gattServer => {
- promise = assert_promise_rejects_with_message(
- gattServer.getPrimaryService('heart_rate'),
- new DOMException(
- 'GATT Server disconnected while retrieving services.',
- 'NetworkError'));
- // Disconnect called to clear attributeInstanceMap and allow the
- // object to get garbage collected.
- gattServer.disconnect();
- })
- .then(runGarbageCollection)
- .then(() => promise);
+ .then(
+ () =>
+ requestDeviceWithKeyDown({filters: [{services: ['heart_rate']}]}))
+ .then(device => device.gatt.connect())
+ .then(gattServer => {
+ promise = assert_promise_rejects_with_message(
+ gattServer.getPrimaryService('heart_rate'),
+ new DOMException(
+ 'GATT Server is disconnected. ' +
+ 'Cannot retrieve services. ' +
+ '(Re)connect first with `device.gatt.connect`.',
+ 'NetworkError'));
+ // Disconnect called to clear attributeInstanceMap and allow the
+ // object to get garbage collected.
+ gattServer.disconnect();
+ })
+ .then(runGarbageCollection)
+ .then(() => promise);
}, 'Garbage Collection ran during a getPrimaryService call that failed. ' +
'Should not crash.');

Powered by Google App Engine
This is Rietveld 408576698