Bug 1509239 [wpt PR 14175] - Fix bad merge 'Merge branch 'master' into gecko/1498793'., a=testonly
authorJan-Ivar Bruaroey <wingboy@gmail.com>
Fri, 30 Nov 2018 16:53:38 +0000
changeset 449977 a4fb2135c9e9d03cb56d6705b75b456c3e245c25
parent 449976 b40d319a20e548451aab1aa94d7b65f297f44227
child 449978 8556efdd8bdb3db6ab1faa2e4caae19384567970
push id35189
push userccoroiu@mozilla.com
push dateTue, 11 Dec 2018 21:33:05 +0000
treeherdermozilla-central@ac7f3beb6333 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1509239, 14175, 1498793
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1509239 [wpt PR 14175] - Fix bad merge 'Merge branch 'master' into gecko/1498793'., a=testonly Automatic update from web-platform-testsFix bad merge 'Merge branch 'master' into gecko/1498793'. -- Merge pull request #14175 from jan-ivar/mergefix Fix bad merge 'Merge branch 'master' into gecko/1498793'. -- wpt-commits: 379c165e7c1d84d67fa1c53eb3c8c642566427f9, deaca4f1919bd2e44a708fce3a708e01e244da65 wpt-pr: 14175
testing/web-platform/tests/webrtc/RTCRtpTransceiver.https.html
testing/web-platform/tests/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html
--- a/testing/web-platform/tests/webrtc/RTCRtpTransceiver.https.html
+++ b/testing/web-platform/tests/webrtc/RTCRtpTransceiver.https.html
@@ -382,16 +382,36 @@
       } else {
         assert_true(false, 'addTransceiver("foo") throws a TypeError');
       }
     }
 
     hasProps(pc.getTransceivers(), []);
   };
 
+  const checkMsidNoTrackId = async t => {
+    const pc1 = new RTCPeerConnection();
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+    t.add_cleanup(() => pc2.close());
+    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    t.add_cleanup(() => stopTracks(stream));
+    const track = stream.getAudioTracks()[0];
+    pc1.addTrack(track, stream);
+    const offer = await pc1.createOffer();
+    await pc1.setLocalDescription(offer);
+    // Remove track-id from msid
+    offer.sdp = offer.sdp.replace(/(a=msid:[^ \t]+).*\r\n/g, "$1\r\n");
+    assert_true(offer.sdp.includes(`a=msid:${stream.id}\r\n`));
+    await pc2.setRemoteDescription(offer);
+    const answer = await pc2.createAnswer();
+    await pc1.setRemoteDescription(answer);
+    await pc2.setLocalDescription(answer);
+  };
+
   const checkNoMidOffer = async t => {
     const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
     const stream = await navigator.mediaDevices.getUserMedia({audio: true});
     t.add_cleanup(() => stopTracks(stream));
--- a/testing/web-platform/tests/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html
+++ b/testing/web-platform/tests/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html
@@ -64,19 +64,19 @@
           direction: "sendrecv",
           mid: null,
           currentDirection: null,
           stopped: false
         }
       ]);
 
     const offer = await pc.createOffer();
-    assert_true(offer.sdp.includes("a=msid:" + audioStream.id + " " + audio.id),
+    assert_true(offer.sdp.includes("a=msid:" + audioStream.id),
       "offer contains the expected audio msid");
-    assert_true(offer.sdp.includes("a=msid:" + videoStream.id + " " + video.id),
+    assert_true(offer.sdp.includes("a=msid:" + videoStream.id),
       "offer contains the expected video msid");
   };
 
   const checkAddTransceiverWithOfferToReceive = async (t, kinds) => {
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
 
     const propsToSet = kinds.map(kind => {