projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 857512c)
[Chromium] video-referer.html fails
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Feb 2012 10:40:38 +0000 (10:40 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Feb 2012 10:40:38 +0000 (10:40 +0000)
https://bugs.webkit.org/show_bug.cgi?id=79239

Fix error event race at startup and cleanup event code to take
advantage of more succinct video-test.js functionality; such as
waitForEventAndFail, etc.

Since this test uses a <source> element without a 'src' tag, an error
event gets fired during load. If we don't wait until after the <body>
onload fires, we'll pickup this error we don't care about.

Patch by Dale Curtis <dalecurtis@chromium.org> on 2012-02-24
Reviewed by Eric Carlson.

* http/tests/media/video-referer-expected.txt:
* http/tests/media/video-referer.html:
* platform/chromium/test_expectations.txt:

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/http/tests/media/video-referer-expected.txt patch | blob | history
LayoutTests/http/tests/media/video-referer.html patch | blob | history
LayoutTests/platform/chromium/test_expectations.txt patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 018d140..f453034 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2012-02-24  Dale Curtis  <dalecurtis@chromium.org>
+
+        [Chromium] video-referer.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=79239
+
+        Fix error event race at startup and cleanup event code to take
+        advantage of more succinct video-test.js functionality; such as
+        waitForEventAndFail, etc.
+
+        Since this test uses a <source> element without a 'src' tag, an error
+        event gets fired during load. If we don't wait until after the <body>
+        onload fires, we'll pickup this error we don't care about.
+
+        Reviewed by Eric Carlson.
+
+        * http/tests/media/video-referer-expected.txt:
+        * http/tests/media/video-referer.html:
+        * platform/chromium/test_expectations.txt:
+
 2012-02-24  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         Not reviewed. Update layout test results after r108699.
diff --git a/LayoutTests/http/tests/media/video-referer-expected.txt b/LayoutTests/http/tests/media/video-referer-expected.txt
index 574a8f8..64d9bcb 100644 (file)
--- a/LayoutTests/http/tests/media/video-referer-expected.txt
+++ b/LayoutTests/http/tests/media/video-referer-expected.txt
@@ -1,3 +1,4 @@
 EVENT(canplay)
+END OF TEST
 Tests that the media player will send the relevant referer when requesting the media file.
 
diff --git a/LayoutTests/http/tests/media/video-referer.html b/LayoutTests/http/tests/media/video-referer.html
index 69fedb2..09077f8 100644 (file)
--- a/LayoutTests/http/tests/media/video-referer.html
+++ b/LayoutTests/http/tests/media/video-referer.html
@@ -14,26 +14,19 @@
         var frame = document.createElement('iframe');
         frame.width = 0;
         frame.height = 0;
-        frame.src = "data:text/html,<b>test</b>";
         frame.addEventListener('load', function () {
-                video = document.getElementById('video');
                 source = document.getElementById('source');
                 source.src = 'http://127.0.0.1:8000/media/resources/video-referer-check-referer.php?name=' + movie + '&type=' + type;
                 source.type = type;
+
+                waitForEventAndFail('error');
+                waitForEventAndEnd('canplay');
                 video.load();
         });
 
+        frame.src = "data:text/html,<b>test</b>";
         document.body.appendChild(frame);
     }
-    
-    waitForEventAndEnd('error', function () {
-        consoleWrite('FAIL, got error when loading media error: ' + video.error.code);
-    });    
-
-    waitForEvent('canplay', function () {
-        if (window.layoutTestController)
-            window.layoutTestController.notifyDone();
-    } );
 </script>
 Tests that the media player will send the relevant referer when requesting the media file.<br/>
 </body>
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index f322a1f..e35bbb8 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -4202,9 +4202,6 @@ BUGCR115073 SLOW LINUX DEBUG : inspector/debugger/script-formatter-breakpoints.h
 
 BUGWK79224 VISTA WIN7 : fast/canvas/webgl/tex-image-with-format-and-type.html = TEXT
 
-// Failing after test was updated in r108387, media engine sending incorrect referrer?
-BUGWK79239 : http/tests/media/video-referer.html = FAIL
-
 // Need rebaselining after bug 75091
 BUGWK75091 SKIP : svg/carto.net/tabgroup.svg = FAIL
 BUGWK75091 SKIP : svg/carto.net/window.svg = FAIL
Domain: Web Framework / Uncategorized;