Changeset 236555 in webkit

Timestamp:

Sep 27, 2018 10:03:45 AM (6 years ago)

Author:

youenn@apple.com

Message:

LayoutTest webrtc/video-unmute.html is a flaky timeout
​https://bugs.webkit.org/show_bug.cgi?id=172879
<rdar://problem/32548738>

Reviewed by Eric Carlson.

• platform/ios-wk2/TestExpectations:
• platform/mac-wk2/TestExpectations:
• webrtc/video-unmute.html:

Resort on routines.js black frame routine.
Reenable test in mac and ios.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• platform/ios-wk2/TestExpectations (modified) (1 diff)
• platform/mac-wk2/TestExpectations (modified) (1 diff)
• webrtc/video-unmute.html (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-09-27  Youenn Fablet  <youenn@apple.com>
+
+        LayoutTest webrtc/video-unmute.html is a flaky timeout
+        https://bugs.webkit.org/show_bug.cgi?id=172879
+        <rdar://problem/32548738>
+
+        Reviewed by Eric Carlson.
+
+        * platform/ios-wk2/TestExpectations:
+        * platform/mac-wk2/TestExpectations:
+        * webrtc/video-unmute.html:
+        Resort on routines.js black frame routine.
+        Reenable test in mac and ios.
+
 2018-09-27  Andy Estes  <aestes@apple.com>
 

trunk/LayoutTests/platform/ios-wk2/TestExpectations

@@ -1250 +1250 @@
 webkit.org/b/181392 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https.html [ Pass Failure ]
 
-webkit.org/b/172879 webrtc/video-unmute.html [ Skip ]
-
 webkit.org/b/181957 [ Release ] http/tests/misc/resource-timing-resolution.html [ Pass Failure ]
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -805 +805 @@
 webkit.org/b/181107 http/wpt/cache-storage/cache-put-stream.https.any.html [ Pass Failure ]
 
-webkit.org/b/172879 webrtc/video-unmute.html [ Skip ]
-
 webkit.org/b/181502 swipe/pushstate-with-manual-scrollrestoration.html [ Failure ]
 

trunk/LayoutTests/webrtc/video-unmute.html

@@ -12 +12 @@
         <canvas id="canvas1" width="320" height="240"></canvas>
         <canvas id="canvas2" width="320" height="240"></canvas>
-        <canvas id="canvas3" width="320" height="240"></canvas>
         <script src ="routines.js"></script>
         <script>
-function isVideoBlack(id)
-{
-    var canvas = document.getElementById(id);
-    canvas.width = video.videoWidth;
-    canvas.height = video.videoHeight;
-    canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height);
-
-    imageData = canvas.getContext('2d').getImageData(0, 0, canvas.width, canvas.height);
-    data = imageData.data;
-    for (var cptr = 0; cptr < canvas.width * canvas.height; ++cptr) {
-        // Approximatively black pixels.
-        if (data[4 * cptr] > 10 || data[4 * cptr + 1] > 10 || data[4 * cptr + 2] > 10)
-            return false;
-    }
-    return true;
-}
-
-function pollVideoBlackCheck(expected, id, resolve, reject, counter)
-{
-    if (isVideoBlack(id) === expected) {
-        resolve();
-        return;
-    }
-
-    if (!counter)
-        counter = 0;
-    else if (++counter > 40) {
-        reject("test for " + id + " timed out");
-        return;
-    }
-    setTimeout(() => pollVideoBlackCheck(expected, id, resolve, reject, counter), 100);
-}
-
-function checkVideoBlack(expected, id)
-{
-    return new Promise((resolve, reject) => {
-        pollVideoBlackCheck(expected, id, resolve, reject);
-    });
-}
-
 var track;
 var remoteTrack;
@@ -83 +42 @@
 
 promise_test((test) => {
-    return checkVideoBlack(true, "canvas1");
+    return checkVideoBlack(true, canvas1, video);
 }, "Track is disabled, video should be black");
 
 promise_test((test) => {
     track.enabled = true;
-    return checkVideoBlack(false, "canvas2");
+    return checkVideoBlack(false, canvas2, video);
 }, "Track is enabled, video should not be black");