Skip to content

GitLab

T
tangled
Commit c1c5f5fc authored by Harald Alvestrand's avatar Harald Alvestrand Committed by Commit Bot
Browse files
Options

Rebase max-message-size tests, and fix max-message-size in Blink 

This also adds a WPT test that SCTP SDP syntax is correct.

Bug: chromium:943975
Change-Id: I441bd4f09de2a13f003acecc3e1ded56041a1758
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1614217
Commit-Queue: Henrik Boström <hbos@chromium.org>
Reviewed-by: default avatarHenrik Boström <hbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#660784}
parent b2645eac
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 9 deletions
third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
View file @ c1c5f5fc
...@@ -2769,7 +2769,6 @@ void RTCPeerConnection::DidModifySctpTransport( ...@@ -2769,7 +2769,6 @@ void RTCPeerConnection::DidModifySctpTransport(
sctp_transport_->native_transport() != snapshot.transport) { sctp_transport_->native_transport() != snapshot.transport) {
sctp_transport_ = MakeGarbageCollected<RTCSctpTransport>( sctp_transport_ = MakeGarbageCollected<RTCSctpTransport>(
GetExecutionContext(), snapshot.transport); GetExecutionContext(), snapshot.transport);
sctp_transport_->ChangeState(snapshot.sctp_transport_state);
} }
if (!sctp_transport_->transport() || if (!sctp_transport_->transport() ||
sctp_transport_->transport()->native_transport() != sctp_transport_->transport()->native_transport() !=
...@@ -2778,6 +2777,7 @@ void RTCPeerConnection::DidModifySctpTransport( ...@@ -2778,6 +2777,7 @@ void RTCPeerConnection::DidModifySctpTransport(
snapshot.sctp_transport_state.dtls_transport(), snapshot.sctp_transport_state.dtls_transport(),
snapshot.dtls_transport_state)); snapshot.dtls_transport_state));
} }
sctp_transport_->ChangeState(snapshot.sctp_transport_state);
} }
void RTCPeerConnection::DidModifyTransceivers( void RTCPeerConnection::DidModifyTransceivers(
......
third_party/blink/web_tests/TestExpectations
View file @ c1c5f5fc
...@@ -5615,12 +5615,6 @@ crbug.com/963141 [ Mac Win ] media/video-object-fit.html [ Pass Failure ] ...@@ -5615,12 +5615,6 @@ crbug.com/963141 [ Mac Win ] media/video-object-fit.html [ Pass Failure ]
crbug.com/963141 media/video-object-fit-change.html [ Pass Failure ] crbug.com/963141 media/video-object-fit-change.html [ Pass Failure ]
crbug.com/963141 [ Mac Win ] media/controls/video-overlay-cast-light-rendering.html [ Pass Failure ] crbug.com/963141 [ Mac Win ] media/controls/video-overlay-cast-light-rendering.html [ Pass Failure ]
# Disable tests in order to land
# https://webrtc-review.googlesource.com/c/src/+/135948
crbug.com/943975 external/wpt/webrtc/RTCDataChannel-send.html [ Pass Failure ]
crbug.com/943975 external/wpt/webrtc/RTCSctpTransport-maxMessageSize.html [ Pass Failure ]
crbug.com/943975 virtual/webrtc-wpt-plan-b/external/wpt/webrtc/RTCSctpTransport-maxMessageSize.html [ Pass Failure ]
# Sheriff 2019-05-16 # Sheriff 2019-05-16
crbug.com/963734 [ Mac ] mojo/bind-intercepted-interface-in-worker.html [ Failure ] crbug.com/963734 [ Mac ] mojo/bind-intercepted-interface-in-worker.html [ Failure ]
crbug.com/963734 [ Mac ] shapedetection/detection-on-worker.html [ Timeout ] crbug.com/963734 [ Mac ] shapedetection/detection-on-worker.html [ Timeout ]
......
third_party/blink/web_tests/external/wpt/webrtc/RTCDataChannel-send-expected.txt
View file @ c1c5f5fc
...@@ -9,6 +9,6 @@ FAIL Data channel should be able to send Blob message and receive as ArrayBuffer ...@@ -9,6 +9,6 @@ FAIL Data channel should be able to send Blob message and receive as ArrayBuffer
FAIL Data channel should be able to send ArrayBuffer message and receive as Blob promise_test: Unhandled rejection with value: object "NotSupportedError: Failed to set the 'binaryType' property on 'RTCDataChannel': Blob support not implemented yet" FAIL Data channel should be able to send ArrayBuffer message and receive as Blob promise_test: Unhandled rejection with value: object "NotSupportedError: Failed to set the 'binaryType' property on 'RTCDataChannel': Blob support not implemented yet"
FAIL Data channel binaryType should receive message as Blob by default assert_equals: Expect initial binaryType value to be blob expected "blob" but got "arraybuffer" FAIL Data channel binaryType should receive message as Blob by default assert_equals: Expect initial binaryType value to be blob expected "blob" but got "arraybuffer"
FAIL Sending multiple messages with different types should succeed and be received assert_unreached: Unexpected promise rejection: NotSupportedError: Failed to execute 'send' on 'RTCDataChannel': Blob support not implemented yet Reached unreachable code FAIL Sending multiple messages with different types should succeed and be received assert_unreached: Unexpected promise rejection: NotSupportedError: Failed to execute 'send' on 'RTCDataChannel': Blob support not implemented yet Reached unreachable code
FAIL Calling send() up to max size should succeed, above max size should fail assert_equals: Size mismatch expected 524288 but got 262528 FAIL Calling send() up to max size should succeed, above max size should fail assert_throws: function "() => channel1.send(message)" did not throw
Harness: the test ran to completion. Harness: the test ran to completion.
third_party/blink/web_tests/external/wpt/webrtc/protocol/sctp-format.html 0 → 100644
View file @ c1c5f5fc
<!doctype html>
<meta charset=utf-8>
<title>RTCPeerconnection SDP SCTP format test</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="../RTCPeerConnection-helper.js"></script>
<script>
'use strict';
promise_test(async t => {
const caller = new RTCPeerConnection();
const callee = new RTCPeerConnection();
t.add_cleanup(() => caller.close());
t.add_cleanup(() => callee.close());
caller.createDataChannel('channel');
const offer = await caller.createOffer();
const [preamble, media_section, postamble] = offer.sdp.split('\r\nm=');
assert_true(typeof(postamble) === 'undefined');
assert_greater_than(media_section.search(
/^application \d+ UDP\/DTLS\/SCTP webrtc-datachannel\r\n/), -1);
assert_greater_than(media_section.search(/\r\na=sctp-port:\d+\r\n/), -1);
assert_greater_than(media_section.search(/\r\na=mid:/), -1);
}, 'Generated Datachannel SDP uses correct SCTP offer syntax');
</script>
third_party/blink/web_tests/external/wpt/webrtc/RTCSctpTransport-maxMessageSize-expected.txt → third_party/blink/web_tests/virtual/webrtc-wpt-plan-b/external/wpt/webrtc/RTCSctpTransport-maxMessageSize-expected.txt
View file @ c1c5f5fc
This is a testharness.js-based test. This is a testharness.js-based test.
FAIL Determine the local side send limitation (canSendSize) by offering a max-message-size of 0 assert_not_equals: SDP should have max-message-size attribute got disallowed value null FAIL Determine the local side send limitation (canSendSize) by offering a max-message-size of 0 assert_not_equals: RTCSctpTransport must be available got disallowed value null
FAIL Remote offer SDP missing max-message-size attribute assert_not_equals: canSendSize needs to be determined got disallowed value null FAIL Remote offer SDP missing max-message-size attribute assert_not_equals: canSendSize needs to be determined got disallowed value null
FAIL max-message-size with a (non-zero) value provided by the remote peer assert_not_equals: canSendSize needs to be determined got disallowed value null FAIL max-message-size with a (non-zero) value provided by the remote peer assert_not_equals: canSendSize needs to be determined got disallowed value null
FAIL Renegotiate max-message-size with various values provided by the remote peer assert_not_equals: canSendSize needs to be determined got disallowed value null FAIL Renegotiate max-message-size with various values provided by the remote peer assert_not_equals: canSendSize needs to be determined got disallowed value null
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment