Bug 1643058: Clean up ini files. r=jib

Differential Revision: https://phabricator.services.mozilla.com/D79527
2020-06-25 13:20:44 +00:00 · 2020-06-25 13:20:44 +00:00 · 3ff8beb0eb
--- a/testing/web-platform/meta/webrtc/RTCCertificate.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCCertificate.html.ini
@ -1,6 +1,4 @@
 [RTCCertificate.html]
-  expected:
-    if processor == "aarch64": ["OK", "CRASH"]
  [Calling setConfiguration with different set of certs should reject with InvalidModificationError]
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1253706
    expected: FAIL
--- a/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange-long.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange-long.https.html.ini
@ -1,7 +0,0 @@
-[RTCDTMFSender-ontonechange-long.https.html]
-  expected:
-    if (os == "linux") and not debug and not webrender: [OK, TIMEOUT]
-  [insertDTMF with duration greater than 6000 should be clamped to 6000]
-    expected:
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
-
--- a/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange.https.html.ini
@ -1,6 +0,0 @@
-[RTCDTMFSender-ontonechange.https.html]
-  disabled:
-    if (os == "android") and e10s: bug 1550895 (frequently fails on geckoview)
-  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1550493, https://bugzilla.mozilla.org/show_bug.cgi?id=1548124
-  expected:
-    if (os == "linux") and not webrender and not debug: ["OK", "TIMEOUT"]
--- a/testing/web-platform/meta/webrtc/RTCDataChannel-bufferedAmount.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCDataChannel-bufferedAmount.html.ini
@ -1,3 +0,0 @@
-[RTCDataChannel-bufferedAmount.html]
-  expected:
-    if (os == "android") and not debug: ["OK", "CRASH"]
--- a/testing/web-platform/meta/webrtc/RTCDataChannel-close.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCDataChannel-close.html.ini
@ -1,19 +1,25 @@
 [RTCDataChannel-close.html]
+
  [Close datachannel causes onclosing and onclose to be called]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1611953

  [Close datachannel causes closing and close event to be called]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641026

  [Close peerconnection causes close event and error to be called on datachannel]
    expected: FAIL
+    bug: Probably https://bugzilla.mozilla.org/show_bug.cgi?id=1611953

  [Close negotiated datachannel causes closing and close event to be called]
    expected: FAIL
+    bug: Probably https://bugzilla.mozilla.org/show_bug.cgi?id=1641026

  [Close negotiated datachannel causes onclosing and onclose to be called]
    expected: FAIL
+    bug: Probably https://bugzilla.mozilla.org/show_bug.cgi?id=1611953

  [Close peerconnection causes close event and error to be called on negotiated datachannel]
    expected: FAIL
-
+    bug: Probably https://bugzilla.mozilla.org/show_bug.cgi?id=1611953
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-constructor.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-constructor.html.ini
@ -1,6 +1,4 @@
 [RTCPeerConnection-constructor.html]
-  expected:
-    if webrender and (os == "linux") and not debug: ["OK", "CRASH"]
  [new RTCPeerConnection({ iceCandidatePoolSize: toNumberThrows })]
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1529398
    expected: FAIL
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-createDataChannel.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-createDataChannel.html.ini
@ -1,22 +1 @@
-[RTCPeerConnection-createDataChannel.html]
-  expected:
-    if (processor == "x86") and (os == "win") and not debug: ["TIMEOUT", "OK", "CRASH"]
-    if (processor == "x86") and (os == "linux"): ["OK", "TIMEOUT", "CRASH"]
-  [Stopping the bundle-tag when there is a negotiated datachannel in the bundle should kill the DataChannel]
-    expected:
-      if (processor == "x86") and (os == "win") and not debug: NOTRUN
-
-  [addTrack, then creating negotiated datachannel, should negotiate properly]
-    expected:
-      if (processor == "x86") and (os == "win") and not debug: ["TIMEOUT", "PASS", "NOTRUN"]
-      if (processor == "x86") and (os == "linux"): ["PASS", "TIMEOUT", "NOTRUN"]
-
-  [addTrack, then creating negotiated datachannel, should negotiate properly when max-bundle is used]
-    expected:
-      if (processor == "x86") and (os == "win") and not debug: ["NOTRUN", "TIMEOUT"]
-      if (processor == "x86") and (os == "linux"): ["PASS", "TIMEOUT", "NOTRUN"]
-
-  [New negotiated datachannel should be in the connecting state after creation (after connection establishment)]
-    expected:
-      if (processor == "x86") and not debug: ["PASS", "TIMEOUT"]

--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-generateCertificate.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-generateCertificate.html.ini
@ -1,5 +1,5 @@
 [RTCPeerConnection-generateCertificate.html]
  [generateCertificate() with 0 expires parameter should generate expired cert]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1402717
    expected:
-      if (processor == "x86") and not debug: ["PASS", "FAIL"]
-
+      if (os == "win"): [PASS, FAIL]
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState-disconnected.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState-disconnected.https.html.ini
@ -1,7 +0,0 @@
-[RTCPeerConnection-iceConnectionState-disconnected.https.html]
-  expected:
-    if (os == "win") and webrender and not debug and not fission: ["OK", "TIMEOUT"]
-  [ICE goes to disconnected if the other side goes away]
-    expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "TIMEOUT"]
-
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState.https.html.ini
@ -1,52 +1,16 @@
 [RTCPeerConnection-iceConnectionState.https.html]
-  expected:
-    if (os == "linux") and not debug and (processor == "x86_64"): ["OK", "CRASH"]
-    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
  [connection with one data channel should eventually have connected connection state]
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299
-    expected:
-      if (os == "mac") and not debug: ["FAIL", "TIMEOUT"]
-      FAIL
+    expected: FAIL

  [iceConnectionState changes at the right time, with bundle policy max-bundle]
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
-    expected:
-      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
-      FAIL
+    expected: FAIL

  [iceConnectionState changes at the right time, with bundle policy max-compat]
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
-    expected:
-      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
-      FAIL
+    expected: FAIL

  [iceConnectionState changes at the right time, with bundle policy balanced]
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
-    expected:
-      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
-      FAIL
-
-  [Closing a PeerConnection should not fire iceconnectionstatechange event]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
-
-  [ICE can connect in a recvonly usecase]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
-
-  [connection with audio and video tracks should eventually have connected connection state]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
-
-  [connection with audio track should eventually have connected connection state]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
-
-  [Responder ICE connection state behaves as expected]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
-
-  [connection with one data channel should eventually have connected or completed connection state]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
-
+    expected: FAIL
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-mandatory-getStats.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-mandatory-getStats.https.html.ini
@ -1,124 +1,166 @@
 [RTCPeerConnection-mandatory-getStats.https.html]
+
  [RTCRtpStreamStats's transportId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225723

  [RTCRtpStreamStats's codecId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641024

  [RTCReceivedRtpStreamStats's packetsDiscarded]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1335967

  [RTCInboundRtpStreamStats's trackId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1381701

  [RTCInboundRtpStreamStats's receiverId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641020

  [RTCOutboundRtpStreamStats's trackId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1381701

  [RTCOutboundRtpStreamStats's senderId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641018

  [RTCPeerConnectionStats's dataChannelsOpened]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1531087

  [RTCPeerConnectionStats's dataChannelsClosed]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1531087

  [RTCMediaStreamStats's streamIdentifer]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641014

  [RTCMediaStreamStats's trackIds]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641014

  [RTCMediaHandlerStats's trackIdentifier]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641013

  [RTCMediaHandlerStats's remoteSource]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641013

  [RTCMediaHandlerStats's ended]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641013

  [RTCAudioHandlerStats's audioLevel]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641010

  [RTCVideoHandlerStats's frameWidth]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641009

  [RTCVideoHandlerStats's frameHeight]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641009

  [RTCVideoHandlerStats's framesPerSecond]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641009

  [RTCVideoSenderStats's framesSent]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641008

  [RTCVideoReceiverStats's framesReceived]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641007

  [RTCVideoReceiverStats's framesDecoded]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641007

  [RTCVideoReceiverStats's framesDropped]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641007

  [RTCVideoReceiverStats's partialFramesLost]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641007

  [RTCCodecStats's payloadType]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225722

  [RTCCodecStats's codecType]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225722

  [RTCCodecStats's clockRate]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225722

  [RTCCodecStats's channels]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225722

  [RTCCodecStats's sdpFmtpLine]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225722

  [RTCTransportStats's bytesSent]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225723

  [RTCTransportStats's bytesReceived]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225723

  [RTCTransportStats's rtcpTransportStatsId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225723

  [RTCTransportStats's selectedCandidatePairId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225723

  [RTCTransportStats's localCertificateId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225723

  [RTCTransportStats's remoteCertificateId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225723

  [RTCIceCandidatePairStats's totalRoundTripTime]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1542938

  [RTCIceCandidatePairStats's currentRoundTripTime]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1542938

  [RTCIceCandidateStats's url]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1508543

  [RTCCertificateStats's fingerprint]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225724

  [RTCCertificateStats's fingerprintAlgorithm]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225724

  [RTCCertificateStats's base64Certificate]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225724

  [RTCCertificateStats's issuerCertificateId]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225724

--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-ondatachannel.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-ondatachannel.html.ini
@ -1,35 +1,19 @@
 [RTCPeerConnection-ondatachannel.html]
-  expected:
-    if (processor == "x86") and (os == "win") and not debug: ["TIMEOUT", "OK"]
-    [OK, TIMEOUT]
-  [In-band negotiated channel created on remote peer should match the same (default) configuration as local peer]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1529695, https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
-    expected:
-      if (processor == "x86") and (os == "win") and not debug: ["NOTRUN", "FAIL"]
-      [PASS, FAIL, NOTRUN]
+  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
+  expected: [OK, TIMEOUT]

  [In-band negotiated channel created on remote peer should match the same configuration as local peer]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1551589, https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
-    expected:
-      if (processor == "x86") and (os == "win") and not debug: ["TIMEOUT", "FAIL", "NOTRUN"]
-      if (processor == "x86") and (os == "linux"): ["PASS", "FAIL", "TIMEOUT", "NOTRUN"]
-      [PASS, FAIL, NOTRUN]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
+    expected: [PASS, TIMEOUT]
+
+  [In-band negotiated channel created on remote peer should match the same (default) configuration as local peer]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
+    expected: [PASS, NOTRUN]

  [Open event should not be raised when sending and immediately closing the channel in the datachannel event]
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
-    expected:
-      if (os == "linux") and not debug and fission: ["PASS", "TIMEOUT", "NOTRUN"]
-      if (os == "linux") and not debug and not fission: ["PASS", "TIMEOUT", "NOTRUN"]
-      [PASS, TIMEOUT]

  [Negotiated channel should not fire datachannel event on remote peer]
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
-    expected:
-      if (processor == "x86") and (os == "win") and not debug: ["NOTRUN", "PASS", "TIMEOUT"]
-      [PASS, TIMEOUT, NOTRUN]
-
-  [Open event should be raised when closing the channel in the datachannel event after enqueuing a task]
-    expected:
-      if (os == "linux") and not debug and not fission: ["PASS", "TIMEOUT"]
-      if (os == "linux") and not debug and fission: ["PASS", "TIMEOUT", "NOTRUN"]
+    expected: [PASS, NOTRUN]

--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-onnegotiationneeded.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-onnegotiationneeded.html.ini
@ -1,4 +1,5 @@
 [RTCPeerConnection-onnegotiationneeded.html]
+
  [Calling setStreams should cause negotiationneeded to fire]
    expected: FAIL
-
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1510802
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-ontrack.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-ontrack.https.html.ini
@ -1,3 +0,0 @@
-[RTCPeerConnection-ontrack.https.html]
-  expected:
-    if processor == "aarch64": ["OK", "CRASH"]
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-operations.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-operations.https.html.ini
@ -1,6 +1,4 @@
 [RTCPeerConnection-operations.https.html]
-  expected:
-    if (os == "win") and not debug and not webrender and (processor == "x86_64"): [OK, TIMEOUT]
  [sender.getStats does NOT use the operations chain]
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1620689
    expected: FAIL
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-restartIce.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-restartIce.https.html.ini
@ -1,6 +1,4 @@
 [RTCPeerConnection-restartIce.https.html]
-  restart-after:
-    if (os == "android") and e10s: bug 1566857 (frequently fails on geckoview)
  [restartIce() survives remote offer containing partial restart]
    expected: FAIL
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1468993
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-setLocalDescription-parameterless.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-setLocalDescription-parameterless.https.html.ini
@ -1,6 +1,9 @@
 [RTCPeerConnection-setLocalDescription-parameterless.https.html]
  [Parameterless SLD() uses [[LastCreatedAnswer\]\] if it is still valid]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1055080

  [Parameterless SLD() uses [[LastCreatedOffer\]\] if it is still valid]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1055080
+
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html.ini
@ -1,7 +1 @@
-[RTCPeerConnection-setRemoteDescription-tracks.https.html]
-  disabled:
-    if (os == "android") and e10s: bug 1550895 (frequently fails on geckoview)
-    if (os == "win") and debug and (bits == 32): bug 1641974 (permafails on win32 debug with bug 1602757 landed)
-  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1550493, https://bugzilla.mozilla.org/show_bug.cgi?id=1548124
-

--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-transceivers.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-transceivers.https.html.ini
@ -1,6 +1,7 @@
 [RTCPeerConnection-transceivers.https.html]
  disabled:
-    if (os == "android") and e10s: bug 1550895 (frequently fails on geckoview)
+    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1641237
+
  [addTransceiver(track, init): initialize sendEncodings\[0\].active to false]
    expected: FAIL
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1396918
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini
@ -1,12 +1,11 @@
 [RTCPeerConnection-videoDetectorTest.html]
  expected:
-    if (os == "win") and (processor == "x86") and debug: ["TIMEOUT", "OK"]
    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
+  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1645626
  [Signal detector detects track change within reasonable time]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526207
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526207, https://bugzilla.mozilla.org/show_bug.cgi?id=1645626
    expected:
      if (os == "android") and release_or_beta: PASS
-      if (os == "win") and (processor == "x86") and debug: ["TIMEOUT", "PASS"]
+      if (os == "android") and e10s: FAIL
      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
-      if os == "android": FAIL

--- a/testing/web-platform/meta/webrtc/RTCRtpSender-replaceTrack.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCRtpSender-replaceTrack.https.html.ini
@ -1,11 +1,7 @@
 [RTCRtpSender-replaceTrack.https.html]
-  expected:
-    if (os == "win") and (processor == "x86") and debug: TIMEOUT
-
  [ReplaceTrack transmits the new track not the old track]
    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526207
    expected:
      if (os == "android") and release_or_beta: PASS
-      if (os == "win") and (processor == "x86") and debug: TIMEOUT
-      if os == "android": FAIL
+      if (os == "android"): FAIL

--- a/testing/web-platform/meta/webrtc/RTCRtpSender-setStreams.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCRtpSender-setStreams.https.html.ini
@ -1,16 +1,2 @@
 [RTCRtpSender-setStreams.https.html]
-  [Adding streams and changing direction causes new streams to be reported via ontrack on callee]
-    expected: FAIL
-
-  [setStreams causes streams to be reported via ontrack on callee]
-    expected: FAIL
-
-  [Adding streams to an active transceiver causes new streams to be reported via ontrack on callee]
-    expected: FAIL
-
-  [setStreams() fires InvalidStateError on a closed peer connection.]
-    expected: FAIL
-
-  [setStreams can be used to reconstruct a stream with a track on the remote side]
-    expected: FAIL
-
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1510802
--- a/testing/web-platform/meta/webrtc/RTCRtpSender-transport.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCRtpSender-transport.https.html.ini
@ -1,6 +1,3 @@
 [RTCRtpSender-transport.https.html]
  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996

-  [RTCRtpSender/receiver.transport has a value when connected]
-    expected: FAIL
-
--- a/testing/web-platform/meta/webrtc/RTCRtpTransceiver.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCRtpTransceiver.https.html.ini
@ -1,5 +0,0 @@
-[RTCRtpTransceiver.https.html]
-  disabled:
-    if (os == "win") and (processor == "aarch64"): https://bugzilla.mozilla.org/show_bug.cgi?id=1548066
-    if (os == "android") and e10s: bug 1501562 (frequently fails on geckoview)
-  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1550493, https://bugzilla.mozilla.org/show_bug.cgi?id=1548124
--- a/testing/web-platform/meta/webrtc/RTCSctpTransport-maxChannels.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCSctpTransport-maxChannels.html.ini
@ -1,12 +1,3 @@
 [RTCSctpTransport-maxChannels.html]
-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1559911
-  expected:
-    if (os == "linux") and not debug and not webrender and (processor == "x86"): ERROR
-    if (os == "linux") and not debug and webrender: OK
-    ERROR
-  [maxChannels gets instantiated after connecting]
-    expected: FAIL
-
-  [An unconnected peerconnection must not have maxChannels set]
-    expected: FAIL
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299

--- a/testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini
+++ b/testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini
@ -1,13 +1,8 @@
 [bundle.https.html]
-  expected:
-    if (os == "win") and not debug and (processor == "x86_64"): ["OK", "TIMEOUT"]
  [not negotiating BUNDLE creates two separate ice and dtls transports]
-    expected:
-      if (processor == "x86") and not debug: ["FAIL", "TIMEOUT"]
-      FAIL
+    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996

  [bundles on the first transport and closes the second]
-    expected:
-      if (processor == "x86") and not debug: ["FAIL", "TIMEOUT"]
-      FAIL
-
+    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
--- a/testing/web-platform/meta/webrtc/protocol/crypto-suite.https.html.ini
+++ b/testing/web-platform/meta/webrtc/protocol/crypto-suite.https.html.ini
@ -1,25 +1,34 @@
 [crypto-suite.https.html]
  [srtpCipher is acceptable on video-only]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299

  [srtpCipher is acceptable on data-only]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299

  [tlsGroup is acceptable on video-only]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299

  [tlsGroup is acceptable on data-only]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299

  [dtlsCipher is acceptable on video-only]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299

  [dtlsCipher is acceptable on data-only]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299

  [tlsVersion is acceptable on video-only]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299

  [tlsVersion is acceptable on data-only]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299
+

--- a/testing/web-platform/meta/webrtc/protocol/dtls-fingerprint-validation.html.ini
+++ b/testing/web-platform/meta/webrtc/protocol/dtls-fingerprint-validation.html.ini
@ -4,4 +4,5 @@

  [Connection fails if one side provides a wrong DTLS fingerprint]
    expected: TIMEOUT
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1635922

--- a/testing/web-platform/meta/webrtc/protocol/ice-ufragpwd.html.ini
+++ b/testing/web-platform/meta/webrtc/protocol/ice-ufragpwd.html.ini
@ -1,7 +1,9 @@
 [ice-ufragpwd.html]
  [setRemoteDescription with a ice-ufrag containing a non-ice-char fails]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1617686

  [setRemoteDescription with a ice-pwd containing a non-ice-char fails]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1617686

--- a/testing/web-platform/meta/webrtc/protocol/simulcast-answer.html.ini
+++ b/testing/web-platform/meta/webrtc/protocol/simulcast-answer.html.ini
@ -1,4 +1,5 @@
 [simulcast-answer.html]
  [createAnswer() with multiple send encodings should create simulcast answer]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1547036

--- a/testing/web-platform/meta/webrtc/protocol/simulcast-offer.html.ini
+++ b/testing/web-platform/meta/webrtc/protocol/simulcast-offer.html.ini
@ -1,4 +1,5 @@
 [simulcast-offer.html]
  [createOffer() with multiple send encodings should create simulcast offer]
    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1396918

--- a/testing/web-platform/meta/webrtc/protocol/split.https.html.ini
+++ b/testing/web-platform/meta/webrtc/protocol/split.https.html.ini
@ -1,5 +1,3 @@
 [split.https.html]
-  expected: TIMEOUT
-  [Connect audio and video to two independent PeerConnections]
-    expected: TIMEOUT
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1643050

--- a/testing/web-platform/meta/webrtc/simulcast/getStats.https.html.ini
+++ b/testing/web-platform/meta/webrtc/simulcast/getStats.https.html.ini
@ -1,4 +1,4 @@
 [getStats.https.html]
  [Simulcast getStats results]
    expected: FAIL
-
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1643001
--- a/testing/web-platform/meta/webrtc/simulcast/h264.https.html.ini
+++ b/testing/web-platform/meta/webrtc/simulcast/h264.https.html.ini
@ -1,4 +1,4 @@
 [h264.https.html]
  [H264 simulcast setup with three spatial layers]
    expected: FAIL
-
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1531460
--- a/testing/web-platform/meta/webrtc/simulcast/vp8.https.html.ini
+++ b/testing/web-platform/meta/webrtc/simulcast/vp8.https.html.ini
@ -1,4 +1,4 @@
 [vp8.https.html]
  [VP8 simulcast setup with three spatial layers]
    expected: FAIL
-
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1531460