bluetooth: Reject getPrimaryService(s) if frame is not connected

third_party/WebKit/LayoutTests/bluetooth/getPrimaryService/device-disconnects-during.html

Index: third_party/WebKit/LayoutTests/bluetooth/getPrimaryService/device-disconnects-during.html
diff --git a/third_party/WebKit/LayoutTests/bluetooth/gattserverdisconnected-event/disconnected.html b/third_party/WebKit/LayoutTests/bluetooth/getPrimaryService/device-disconnects-during.html
similarity index 55%
copy from third_party/WebKit/LayoutTests/bluetooth/gattserverdisconnected-event/disconnected.html
copy to third_party/WebKit/LayoutTests/bluetooth/getPrimaryService/device-disconnects-during.html
index 7cb69a3e8caa37ccf75ae69067434666df852429..1c2e76de1d8d2013f8846a6eb35fd99625e427ac 100644
--- a/third_party/WebKit/LayoutTests/bluetooth/gattserverdisconnected-event/disconnected.html
+++ b/third_party/WebKit/LayoutTests/bluetooth/getPrimaryService/device-disconnects-during.html
@@ -3,9 +3,9 @@
 <script src="../../resources/testharnessreport.js"></script>
 <script src="../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
- 'use strict';
- promise_test(t => {
-   return setBluetoothFakeAdapter('DisconnectingHeartRateAdapter')
+'use strict';
+promise_test(t => {
+  return setBluetoothFakeAdapter('DisconnectingHeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}],
       optionalServices: [request_disconnection_service_uuid]
@@ -15,11 +15,12 @@
         .then(gattServer => gattServer.getPrimaryService(request_disconnection_service_uuid))
         .then(service => service.getCharacteristic(request_disconnection_characteristic_uuid))
         .then(requestDisconnection => {
-          // This promise hangs unless gattserverdisconnected is fired.
-          let disconnected = eventPromise(device, 'gattserverdisconnected');
-          return Promise.all([requestDisconnection.writeValue(new Uint8Array([0])),
-                              disconnected]);
-        }).then(([, disconnected]) => assert_true(disconnected.bubbles));
+          requestDisconnection.writeValue(new Uint8Array([0]));

[Jeffrey Yasskin, 2016/07/28 22:45:14]

Maybe call .connect() again as soon as the 'gattserverdisconnected' event
arrives. That won't do a great job of testing what happens when the reconnection
beats the getPrimaryService call, since getPrimaryService() will be fast, but if
it's ever flaky, it'll be an indication that something's wrong.

[ortuno, 2016/07/29 16:11:51]

Added specific tests for the reconnection case. WDYT?

+          return assert_promise_rejects_with_message(
+            device.gatt.getPrimaryService('heart_rate'),
+            new DOMException('GATT Server disconnected while retrieving services.',
+                             'NetworkError'));
+        });
     });
- }, 'A device disconnecting while connected should fire the gattserverdisconnected event.');
+}, 'Device disconnects during getPrimaryService. Reject with NetworkError.');
 </script>