Reduce throttling on video-buffering-repaints-controls test to preven…

…t timeout. https://bugs.webkit.org/show_bug.cgi?id=76113 Also reduces flakiness by checking for a repaint between progress and suspend events versus just between progress events. Patch by Dale Curtis <dalecurtis@chromium.org> on 2012-01-23 Reviewed by Adam Barth. * http/tests/media/video-buffering-repaints-controls-expected.txt: Added. * http/tests/media/video-buffering-repaints-controls.html: * platform/chromium-linux/http/tests/media/video-buffering-repaints-controls-expected.png: * platform/chromium-mac-snowleopard/http/tests/media/video-buffering-repaints-controls-expected.txt: Removed. * platform/chromium-win/http/tests/media/video-buffering-repaints-controls-expected.txt: Removed. * platform/chromium/test_expectations.txt: * platform/gtk/http/tests/media/video-buffering-repaints-controls-expected.txt: Removed. Canonical link: https://commits.webkit.org/93685@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@105651 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jan 24, 2012 · ab101ff63d3746248b718229e3001bfe188393a6 · ab101ff
1 parent 1113704
commit ab101ff63d3746248b718229e3001bfe188393a6
Showing 8 changed files with 38 additions and 116 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2012-01-23  Dale Curtis  <dalecurtis@chromium.org>
+
+        Reduce throttling on video-buffering-repaints-controls test to prevent timeout.
+        https://bugs.webkit.org/show_bug.cgi?id=76113
+
+        Also reduces flakiness by checking for a repaint between progress and
+        suspend events versus just between progress events.
+
+        Reviewed by Adam Barth.
+
+        * http/tests/media/video-buffering-repaints-controls-expected.txt: Added.
+        * http/tests/media/video-buffering-repaints-controls.html:
+        * platform/chromium-linux/http/tests/media/video-buffering-repaints-controls-expected.png:
+        * platform/chromium-mac-snowleopard/http/tests/media/video-buffering-repaints-controls-expected.txt: Removed.
+        * platform/chromium-win/http/tests/media/video-buffering-repaints-controls-expected.txt: Removed.
+        * platform/chromium/test_expectations.txt:
+        * platform/gtk/http/tests/media/video-buffering-repaints-controls-expected.txt: Removed.
+
 2012-01-23  Joe Thomas  <joethomas@motorola.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=75799

diff --git a/LayoutTests/http/tests/media/video-buffering-repaints-controls-expected.txt b/LayoutTests/http/tests/media/video-buffering-repaints-controls-expected.txt
@@ -0,0 +1,4 @@
+Test that media controls repaint correctly during paused states when new data is buffered.
+
+
+
diff --git a/LayoutTests/http/tests/media/video-buffering-repaints-controls.html b/LayoutTests/http/tests/media/video-buffering-repaints-controls.html
@@ -1,36 +1,34 @@
 <html>
-   <head>
-       <script src="../../media-resources/media-file.js"></script>
-       <script>
-           var painted = false;
-           function start() {
-               if (window.layoutTestController)
-                   layoutTestController.waitUntilDone();
+    <head>
+        <script src="../../media-resources/media-file.js"></script>
+        <script>
+            function start() {
+                if (window.layoutTestController) {
+                    layoutTestController.dumpAsText(true);
+                    layoutTestController.waitUntilDone();
+                }
 
                 var video = document.querySelector('video');
 
                 video.addEventListener('progress', function(event) {
-                    // Each progress event should correlate to a repaint. Check
-                    // by watching for a repaint between progress events.
-                    if (painted) {
-                        layoutTestController.notifyDone();
-                    } else {
-                        layoutTestController.display();
-                        painted = true;
-                    }
+                    layoutTestController.display();
+                }, false);
+
+                video.addEventListener('suspend', function(event) {
+                    layoutTestController.notifyDone();
                 }, false);
 
                 var mediaFile = findMediaFile("video", "resources/test");
                 var mimeType = mimeTypeForFile(mediaFile);
 
                 // Don't actually play since we're testing via an image diff.
-                video.src = 'http://127.0.0.1:8000/media/video-throttled-load.cgi?&name=' + mediaFile + '&throttle=10&type=' + mimeType
+                video.src = 'http://127.0.0.1:8000/media/video-throttled-load.cgi?&name=' + mediaFile + '&throttle=80&type=' + mimeType
             }
         </script>
     </head>
 
     <body onload="start();">
         <p>Test that media controls repaint correctly during paused states when new data is buffered.</p>
         <video controls preload></video><br/>
-   </body>
+    </body>
 </html>
diff --git a/.../chromium-linux/http/tests/media/video-buffering-repaints-controls-expected.png b/.../chromium-linux/http/tests/media/video-buffering-repaints-controls-expected.png
diff --git a/.../chromium-mac-snowleopard/http/tests/media/video-buffering-repaints-controls-expected.txt b/.../chromium-mac-snowleopard/http/tests/media/video-buffering-repaints-controls-expected.txt
diff --git a/...sts/platform/chromium-win/http/tests/media/video-buffering-repaints-controls-expected.txt b/...sts/platform/chromium-win/http/tests/media/video-buffering-repaints-controls-expected.txt
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3833,7 +3833,7 @@ BUGV81900 SLOW LINUX DEBUG : inspector/debugger/debugger-breakpoints-not-activat
 BUGWK73710 LINUX DEBUG : svg/W3C-SVG-1.1/animate-elem-62-t.svg = PASS CRASH
 
 // New test, image results added but it is timing out on Leopard.
-BUGWK75570 LEOPARD : http/tests/media/video-buffering-repaints-controls.html = PASS TIMEOUT
+BUGWK75570 : http/tests/media/video-buffering-repaints-controls.html = IMAGE
 
 // New reftest failing on Win7.
 BUGWK76050 WIN7 : fast/text/font-kerning.html = IMAGE

diff --git a/LayoutTests/platform/gtk/http/tests/media/video-buffering-repaints-controls-expected.txt b/LayoutTests/platform/gtk/http/tests/media/video-buffering-repaints-controls-expected.txt