[tor-commits] [tor-browser/tor-browser-84.0-10.0-1] Bug 1680528 - set several webrtc/mediacapturing test as passing on beta and release. r=drno a=test-only

[sysrqb at torproject.org]

commit f789719e4fb6150fd7f9d7410ad4075c0d8145a3
Author: Sebastian Hengst <archaeopteryx at coole-files.de>
Date:   Tue Dec 8 19:11:56 2020 +0000

    Bug 1680528 - set several webrtc/mediacapturing test as passing on beta and release. r=drno a=test-only
    
    More details about the underlying issue in bug 1526207.
    
    Differential Revision: https://phabricator.services.mozilla.com/D98963
---
 .../MediaRecorder-no-sink.https.html.ini           |  6 +--
 .../MediaRecorder-peerconnection.https.html.ini    | 58 +++++++---------------
 .../RTCPeerConnection-videoDetectorTest.html.ini   |  3 +-
 .../RTCRtpSender-replaceTrack.https.html.ini       |  2 +-
 4 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini
index f1843e6dea9d..f1f7909e3471 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini
@@ -1,14 +1,14 @@
 [MediaRecorder-no-sink.https.html]
   expected:
     if release_or_beta and (os == "android"): [OK, TIMEOUT]
-    if os == "android": TIMEOUT
+    if os == "android" and nightly_build: TIMEOUT
   [PeerConnection MediaRecorder records video from PeerConnection without sinks]
     expected:
       if release_or_beta and (os == "android"): [PASS, TIMEOUT]
-      if os == "android": TIMEOUT
+      if os == "android" and nightly_build: TIMEOUT
 
   [PeerConnection MediaRecorder records audio/video from PeerConnection without sinks]
     expected:
       if release_or_beta and (os == "android"): [PASS, NOTRUN]
-      if os == "android": NOTRUN
+      if os == "android" and nightly_build: NOTRUN
 
diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini
index 0011d0a232b1..b81eb9052c83 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini
@@ -1,106 +1,86 @@
 [MediaRecorder-peerconnection.https.html]
   expected:
-    if (os == "android") and debug and not webrender: ["TIMEOUT", "CRASH", "ERROR"]
-    if (os == "android") and debug and webrender: ["TIMEOUT", "ERROR"]
-    if (os == "android") and not debug: ["TIMEOUT", "ERROR", "CRASH"]
+    if (os == "android") and nightly_build: ["TIMEOUT", "CRASH", "ERROR"]
 
   [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":false} with format \[passthrough\].]
     expected:
-      if (os == "android") and debug: ["TIMEOUT"]
-      if (os == "android") and not debug: ["TIMEOUT"]
+      if os == "android" and nightly_build: TIMEOUT
 
   [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":false} with format \[passthrough\].]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
 
   [PeerConnection MediaRecorder receives data after onstart, {"video":false,"audio":true} with format \[passthrough\].]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
 
   [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":false,"audio":true} with format \[passthrough\].]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
 
   [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":true} with format \[passthrough\].]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
 
   [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":true} with format \[passthrough\].]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
 
   [PeerConnection MediaRecorder receives data after onstart, {"video":false,"audio":true} with format video/webm;codecs=vp8.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
       FAIL
 
   [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":false,"audio":true} with format video/webm;codecs=vp8.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
       FAIL
 
   [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":true} with format video/webm;codecs=vp8.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
       FAIL
 
   [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":true} with format video/webm;codecs=vp8.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
       FAIL
 
   [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":false} with format video/webm;codecs=vp8.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
 
   [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":false} with format video/webm;codecs=vp8.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
 
   [PeerConnection MediaRecorder receives data after onstart, {"video":false,"audio":true} with format video/webm;codecs=vp9.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
       FAIL
 
   [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":false,"audio":true} with format video/webm;codecs=vp9.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
       FAIL
 
   [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":false} with format video/webm;codecs=vp9.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
       FAIL
 
   [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":false} with format video/webm;codecs=vp9.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
       FAIL
 
   [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":true} with format video/webm;codecs=vp9.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
       FAIL
 
   [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":true} with format video/webm;codecs=vp9.]
     expected:
-      if (os == "android") and debug: ["NOTRUN"]
-      if (os == "android") and not debug: ["NOTRUN"]
+      if os == "android" and nightly_build: NOTRUN
       FAIL
 
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini
index 2efe14f6c463..a96e0778ef09 100644
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini
@@ -2,4 +2,5 @@
   [Signal detector detects track change within reasonable time]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526207
     expected:
-      if os == "android": FAIL
+      if os == "android" and nightly_build: FAIL
+
diff --git a/testing/web-platform/meta/webrtc/RTCRtpSender-replaceTrack.https.html.ini b/testing/web-platform/meta/webrtc/RTCRtpSender-replaceTrack.https.html.ini
index 07e9159a4dee..2cd971f29e31 100644
--- a/testing/web-platform/meta/webrtc/RTCRtpSender-replaceTrack.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCRtpSender-replaceTrack.https.html.ini
@@ -2,4 +2,4 @@
   [ReplaceTrack transmits the new track not the old track]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526207
     expected:
-      if (os == "android"): FAIL
+      if (os == "android") and nightly_build: FAIL