projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b98f839)
Layout Test media/video-src-source.html is flaky
authorfischman@chromium.org <fischman@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Apr 2012 17:39:13 +0000 (17:39 +0000)
committerfischman@chromium.org <fischman@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Apr 2012 17:39:13 +0000 (17:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=82227

De-race the test by registering the listener before the event can fire.
Reviewed by Eric Carlson.

* media/video-src-source.html:
* platform/chromium/test_expectations.txt:

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/media/video-src-source.html patch | blob | history
LayoutTests/platform/chromium/test_expectations.txt patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5e3914f..f04f8b5 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2012-04-03  Ami Fischman  <fischman@chromium.org>
 
+        Layout Test media/video-src-source.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=82227
+
+        De-race the test by registering the listener before the event can fire.
+        Reviewed by Eric Carlson.
+
+        * media/video-src-source.html:
+        * platform/chromium/test_expectations.txt:
+
+2012-04-03  Ami Fischman  <fischman@chromium.org>
+
         [Chromium] media/video-delay-load-event.html is flaky on all platforms
         https://bugs.webkit.org/show_bug.cgi?id=64003
 
diff --git a/LayoutTests/media/video-src-source.html b/LayoutTests/media/video-src-source.html
index 9714fb7..cafa700 100644 (file)
--- a/LayoutTests/media/video-src-source.html
+++ b/LayoutTests/media/video-src-source.html
@@ -1,19 +1,13 @@
 <body>
+<video><source></source></video>
 <script src=media-file.js></script>
 <script src=video-test.js></script>
-<div id=panel></div>
 <script>
-    var panel = document.getElementById("panel");
     var mediaFile = findMediaFile("video", "content/test");
-    panel.innerHTML = "<video src=" + mediaFile + " controls><source src=content/error.mpeg></video>";
-</script>
-<script>
-
-    video = mediaElement = document.getElementsByTagName('video')[0];
-
     waitForEvent('loadstart', function () { 
         testExpected("stripExtension(relativeURL(video.currentSrc))", stripExtension(mediaFile));
         endTest();
     } );
-
+    document.getElementsByTagName('source')[0].src = "content/error.mpeg";
+    mediaElement.src = mediaFile;
 </script>
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index b739792..e40ca77 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3892,9 +3892,6 @@ BUGWK82122 LEOPARD SNOWLEOPARD : css3/selectors3/xml/css3-modsel-d4.xml = FAIL P
 BUGWK80531 WIN : fast/table/colspanMinWidth-vertical.html = IMAGE
 BUGWK80531 MAC : fast/table/colspanMinWidth-vertical.html = IMAGE+TEXT
 
-// Flaky on Windows since at least r112042
-BUGWK82227 WIN : media/video-src-source.html = PASS TIMEOUT
-
 BUGWK82628 : svg/hittest/svg-ellipse-non-scale-stroke.xhtml = FAIL
 
 // Flaky/crashing on a single platform every 30 tries or so
Domain: Web Framework / Uncategorized;