Revision cdf5b3962f33d0a05af040097173d8cc827a7d73 authored by Trent Apted on 12 March 2018, 04:02:04 UTC, committed by Blink WPT Bot on 12 March 2018, 04:10:37 UTC
This reverts commit af1c15b16f99d290799c83d34c111bce52447026.
Reason for revert: suspected for persistent failures on Win7 Tests (dbg)(1)
Unexpected Failures:
* external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.html
* external/wpt/bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.html
* external/wpt/bluetooth/service/getCharacteristics/blocklisted-characteristics.https.html
* external/wpt/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.html
* external/wpt/upgrade-insecure-requests/link-upgrade.sub.https.html
since
https://ci.chromium.org/buildbot/chromium.win/Win7%20Tests%20%28dbg%29%281%29/66761
errors like
15:59:42.310 5904 worker/4 external/wpt/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.html crashed, (stderr lines):
15:59:42.311 5904 CONSOLE MESSAGE: line 255: Web Bluetooth is experimental on this platform. See https://github.com/WebBluetoothCG/web-bluetooth/blob/gh-pages/implementation-status.md
15:59:42.327 1300 [1691/5755] external/wpt/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.html failed unexpectedly (content_shell crashed [pid=5644])
Original change's description:
> bluetooth: Use DeviceUUID in FakeBluetooth
>
> This change refactors the Web Bluetooth test API to use the
> DeviceUUIDs helper class defined in BluetoothDevice. Additionally,
> this change finishes the implementation of SimulateGATTServicesChanged,
> and as a result, tests are updated to set the next discovery response
> before calling this interface.
>
> BUG=719826
>
> Change-Id: I0f986eb7afe6fbf7ebaa80ac4b633d46a027b80d
> Reviewed-on: https://chromium-review.googlesource.com/939984
> Commit-Queue: Ovidio Henriquez <odejesush@chromium.org>
> Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#541577}
TBR=cco3@chromium.org,ortuno@chromium.org,odejesush@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 719826
Change-Id: I02bb7066c6f1282191f7a24e91b3d2c5614b8104
Reviewed-on: https://chromium-review.googlesource.com/958741
Reviewed-by: Trent Apted <tapted@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542421}
1 parent 9c9d8f2
RTCPeerConnection-ondatachannel.html
<!doctype html>
<meta charset=utf-8>
<title>RTCPeerConnection.prototype.ondatachannel</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="RTCPeerConnection-helper.js"></script>
<script>
'use strict';
// Test is based on the following editor draft:
// https://w3c.github.io/webrtc-pc/archives/20170605/webrtc.html
// The following helper functions are called from RTCPeerConnection-helper.js:
// exchangeIceCandidates
// doSignalingHandshake
/*
6.2. RTCDataChannel
When an underlying data transport is to be announced
2. Let channel be a newly created RTCDataChannel object.
5. Set channel's readyState attribute to connecting.
6. Fire a datachannel event named datachannel with channel at the
RTCPeerConnection object.
6.3. RTCDataChannelEvent
Firing a datachannel event named e with a RTCDataChannel channel means
that an event with the name e, which does not bubble (except where
otherwise stated) and is not cancelable (except where otherwise stated),
and which uses the RTCDataChannelEvent interface with the channel
attribute set to channel, must be created and dispatched at the given
target.
interface RTCDataChannelEvent : Event {
readonly attribute RTCDataChannel channel;
};
*/
async_test(t => {
const localPc = new RTCPeerConnection();
const remotePc = new RTCPeerConnection();
let eventCount = 0;
const onDataChannel = t.step_func_done(event => {
eventCount++;
assert_equals(eventCount, 1,
'Expect data channel event to fire exactly once');
assert_true(event instanceof RTCDataChannelEvent,
'Expect event to be instance of RTCDataChannelEvent');
assert_equals(event.bubbles, false);
assert_equals(event.cancelable, false);
const { channel } = event;
assert_true(channel instanceof RTCDataChannel,
'Expect channel to be instance of RTCDataChannel');
const { readyState } = channel;
// The spec requires readyState to be connecting at first,
// but it may quickly change to open before the callback
// is invoked, especially with local connections.
assert_true(readyState === 'connecting' || readyState === 'open',
'Expect channel ready state to be either connecting or open');
});
localPc.createDataChannel('test');
remotePc.addEventListener('datachannel', onDataChannel);
exchangeIceCandidates(localPc, remotePc);
doSignalingHandshake(localPc, remotePc);
}, 'datachannel event should fire when new data channel is announced to the remote peer');
/*
6.2. RTCDataChannel
interface RTCDataChannel : EventTarget {
readonly attribute USVString label;
readonly attribute boolean ordered;
readonly attribute unsigned short? maxPacketLifeTime;
readonly attribute unsigned short? maxRetransmits;
readonly attribute USVString protocol;
readonly attribute boolean negotiated;
readonly attribute unsigned short? id;
readonly attribute RTCPriorityType priority;
readonly attribute RTCDataChannelState readyState;
...
};
When an underlying data transport is to be announced
3. Let configuration be an information bundle received from the
other peer as a part of the process to establish the underlying
data transport described by the WebRTC DataChannel Protocol
specification [RTCWEB-DATA-PROTOCOL].
4. Initialize channel's label, ordered, maxPacketLifeTime,
maxRetransmits, protocol, negotiated and id attributes to their
corresponding values in configuration.
*/
async_test(t => {
const localPc = new RTCPeerConnection();
const remotePc = new RTCPeerConnection();
const onDataChannel = t.step_func_done(event => {
const remoteChannel = event.channel;
assert_true(remoteChannel instanceof RTCDataChannel,
'Expect channel to be instance of RTCDataChannel');
assert_equals(remoteChannel.label, 'test');
assert_equals(remoteChannel.id, 8);
assert_equals(remoteChannel.ordered, false);
assert_equals(remoteChannel.maxRetransmits, 1);
assert_equals(remoteChannel.protocol, 'custom');
assert_equals(remoteChannel.priority, 'high');
});
const localChannel = localPc.createDataChannel('test', {
id: 8,
ordered: false,
maxRetransmits: 1,
protocol: 'custom',
priority: 'high'
});
assert_equals(localChannel.label, 'test');
assert_equals(localChannel.id, 8);
assert_equals(localChannel.ordered, false);
assert_equals(localChannel.maxRetransmits, 1);
assert_equals(localChannel.protocol, 'custom');
assert_equals(localChannel.priority, 'high');
remotePc.addEventListener('datachannel', onDataChannel);
exchangeIceCandidates(localPc, remotePc);
doSignalingHandshake(localPc, remotePc);
}, 'Data channel created on remote peer should match the same configuration as local peer');
/*
6.2. RTCDataChannel
Dictionary RTCDataChannelInit Members
negotiated
The default value of false tells the user agent to announce the
channel in-band and instruct the other peer to dispatch a corresponding
RTCDataChannel object. If set to true, it is up to the application
to negotiate the channel and create a RTCDataChannel object with the
same id at the other peer.
*/
async_test(t => {
const localPc = new RTCPeerConnection();
const remotePc = new RTCPeerConnection();
const onDataChannel = t.unreached_func('datachannel event should not be fired');
localPc.createDataChannel('test', {
negotiated: true
});
remotePc.addEventListener('datachannel', onDataChannel);
exchangeIceCandidates(localPc, remotePc);
doSignalingHandshake(localPc, remotePc);
t.step_timeout(t.step_func_done(), 200);
}, 'Data channel created with negotiated set to true should not fire datachannel event on remote peer');
/*
Non-testable
6.2. RTCDataChannel
When an underlying data transport is to be announced
1. If the associated RTCPeerConnection object's [[isClosed]] slot
is true, abort these steps.
The above step is not testable because to reach it we would have to
close the peer connection after the remote peer call
setLocalDescription(answer) but before the underlying data transport
is connected. This require the promise callback for setLocalDescription()
to be called at the right moment, which is not always possible.
*/
</script>
Computing file changes ...
