Modified: trunk/LayoutTests/ChangeLog (236554 => 236555)
--- trunk/LayoutTests/ChangeLog 2018-09-27 16:58:25 UTC (rev 236554)
+++ trunk/LayoutTests/ChangeLog 2018-09-27 17:03:45 UTC (rev 236555)
@@ -1,3 +1,17 @@
+2018-09-27 Youenn Fablet <[email protected]>
+
+ 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 <[email protected]>
[Apple Pay] Support granular errors in PaymentDetailsUpdate
Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (236554 => 236555)
--- trunk/LayoutTests/platform/ios-wk2/TestExpectations 2018-09-27 16:58:25 UTC (rev 236554)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations 2018-09-27 17:03:45 UTC (rev 236555)
@@ -1249,8 +1249,6 @@
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 ]
webkit.org/b/181821 fast/visual-viewport/ios/caret-after-focus-in-fixed.html [ Pass Failure ]
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (236554 => 236555)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2018-09-27 16:58:25 UTC (rev 236554)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2018-09-27 17:03:45 UTC (rev 236555)
@@ -804,8 +804,6 @@
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 ]
webkit.org/b/181750 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https.html [ DumpJSConsoleLogInStdErr Pass Failure ]
Modified: trunk/LayoutTests/webrtc/video-unmute.html (236554 => 236555)
--- trunk/LayoutTests/webrtc/video-unmute.html 2018-09-27 16:58:25 UTC (rev 236554)
+++ trunk/LayoutTests/webrtc/video-unmute.html 2018-09-27 17:03:45 UTC (rev 236555)
@@ -11,49 +11,8 @@
<video id="video" autoplay playsInline width="320" height="240"></video>
<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 =""
<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 = ""
- 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;
promise_test((test) => {
@@ -82,12 +41,12 @@
}, "Setting video exchange");
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");
</script>
