Reduce throttling on video-buffering-repaints-controls test to prevent timeout.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Jan 2012 00:00:55 +0000 (00:00 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Jan 2012 00:00:55 +0000 (00:00 +0000)
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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105651 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/http/tests/media/video-buffering-repaints-controls-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/media/video-buffering-repaints-controls.html
LayoutTests/platform/chromium-linux/http/tests/media/video-buffering-repaints-controls-expected.png
LayoutTests/platform/chromium-mac-snowleopard/http/tests/media/video-buffering-repaints-controls-expected.txt [deleted file]
LayoutTests/platform/chromium-win/http/tests/media/video-buffering-repaints-controls-expected.txt [deleted file]
LayoutTests/platform/chromium/test_expectations.txt
LayoutTests/platform/gtk/http/tests/media/video-buffering-repaints-controls-expected.txt [deleted file]

index 45dac48..60ab781 100644 (file)
@@ -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
new file mode 100644 (file)
index 0000000..917cf17
--- /dev/null
@@ -0,0 +1,4 @@
+Test that media controls repaint correctly during paused states when new data is buffered.
+
+
+
index 6333cb8..097cae6 100644 (file)
@@ -1,30 +1,28 @@
 <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>
@@ -32,5 +30,5 @@
     <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>
index 21b0eb6..504e777 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/http/tests/media/video-buffering-repaints-controls-expected.png and b/LayoutTests/platform/chromium-linux/http/tests/media/video-buffering-repaints-controls-expected.png differ
diff --git a/LayoutTests/platform/chromium-mac-snowleopard/http/tests/media/video-buffering-repaints-controls-expected.txt b/LayoutTests/platform/chromium-mac-snowleopard/http/tests/media/video-buffering-repaints-controls-expected.txt
deleted file mode 100644 (file)
index 49ac9df..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 562x18
-          text run at (0,0) width 562: "Test that media controls repaint correctly during paused states when new data is buffered."
-      RenderBlock (anonymous) at (0,34) size 784x240
-        RenderBR {BR} at (320,240) size 0x0
-layer at (8,42) size 320x240
-  RenderVideo {VIDEO} at (0,0) size 320x240
-layer at (8,42) size 320x240
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,250) size 320x32
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
-layer at (15,256) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,250) size 256x32
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
-    RenderSlider {INPUT} at (7,7) size 184x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-      RenderDeprecatedFlexibleBox {DIV} at (1,1) size 182x16
-        RenderBlock {DIV} at (0,0) size 173x29
-        RenderBlock {DIV} at (173,0) size 9x29
-layer at (235,256) size 58x20 scrollHeight 21
-  RenderDeprecatedFlexibleBox {DIV} at (197,6) size 58x20 [color=#FFFFFF]
-    RenderBlock (anonymous) at (8,0) size 41x21
-      RenderText {#text} at (0,2) size 41x17
-        text run at (0,2) width 41: "00:00"
-layer at (46,252) size 9x29
-  RenderBlock (relative positioned) {DIV} at (0,-6) size 9x29
-layer at (294,250) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
diff --git a/LayoutTests/platform/chromium-win/http/tests/media/video-buffering-repaints-controls-expected.txt b/LayoutTests/platform/chromium-win/http/tests/media/video-buffering-repaints-controls-expected.txt
deleted file mode 100644 (file)
index f7d5898..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 538x19
-          text run at (0,0) width 538: "Test that media controls repaint correctly during paused states when new data is buffered."
-      RenderBlock (anonymous) at (0,36) size 784x240
-        RenderBR {BR} at (320,240) size 0x0
-layer at (8,44) size 320x240
-  RenderVideo {VIDEO} at (0,0) size 320x240
-layer at (8,44) size 320x240
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,252) size 320x32
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
-layer at (15,258) size 18x19
-  RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,252) size 256x32
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
-    RenderSlider {INPUT} at (7,7) size 184x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
-      RenderDeprecatedFlexibleBox {DIV} at (1,1) size 182x16
-        RenderBlock {DIV} at (0,0) size 173x29
-        RenderBlock {DIV} at (173,0) size 9x29
-layer at (235,258) size 58x20 scrollHeight 21
-  RenderDeprecatedFlexibleBox {DIV} at (197,6) size 58x20 [color=#FFFFFF]
-    RenderBlock (anonymous) at (8,0) size 42x21
-      RenderText {#text} at (0,1) size 42x19
-        text run at (0,1) width 42: "00:00"
-layer at (46,254) size 9x29
-  RenderBlock (relative positioned) {DIV} at (0,-6) size 9x29
-layer at (294,252) size 34x32
-  RenderButton {INPUT} at (286,0) size 34x32
index 685189a..1546aef 100644 (file)
@@ -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
deleted file mode 100644 (file)
index db547be..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 575x17
-          text run at (0,0) width 575: "Test that media controls repaint correctly during paused states when new data is buffered."
-      RenderBlock (anonymous) at (0,34) size 784x150
-        RenderBR {BR} at (300,150) size 0x0
-layer at (8,42) size 300x150
-  RenderVideo {VIDEO} at (0,0) size 300x150
-layer at (8,42) size 300x150
-  RenderBlock (relative positioned) {DIV} at (0,0) size 300x150
-layer at (8,42) size 300x150 scrollHeight 160
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,0) size 300x150
-    RenderButton {INPUT} at (0,130) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,130) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
-      RenderBlock (anonymous) at (1,0) size 64x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 64x30
-          RenderBlock (anonymous) at (5,5) size 54x20
-            RenderText {#text} at (0,0) size 54x11
-              text run at (0,0) width 54: "00:00 / 00:00"
-      RenderSlider {INPUT} at (65,0) size 154x20
-        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 150x20
-          RenderBlock {DIV} at (0,4) size 138x12
-          RenderBlock {DIV} at (138,4) size 12x12
-    RenderButton {INPUT} at (240,130) size 20x20
-    RenderButton {INPUT} at (260,130) size 20x20
-    RenderButton {INPUT} at (280,130) size 20x20
-layer at (95,176) size 12x12
-  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12