Title: [98732] trunk/LayoutTests
- Revision
- 98732
- Author
- [email protected]
- Date
- 2011-10-28 09:58:33 -0700 (Fri, 28 Oct 2011)
Log Message
empty-urls.html needs to stop being flaky.
Because it was in http/tests/loading, it output
frame load callbacks, and it was unpredictable whether
the callback for onload or for the load completing would
be called first. Ergo, move the test to http/tests/misc,
and remove the logic which failed to enforce a frame load
callback ordering.
https://bugs.webkit.org/show_bug.cgi?id=67359
Reviewed by Adam Barth.
* http/tests/loading/empty-urls-expected.txt: Removed.
* http/tests/loading/empty-urls.html: Removed.
* http/tests/misc/empty-urls-expected.txt: Copied from LayoutTests/http/tests/loading/empty-urls-expected.txt.
* http/tests/misc/empty-urls.html: Copied from LayoutTests/http/tests/loading/empty-urls.html.
* platform/chromium/test_expectations.txt:
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (98731 => 98732)
--- trunk/LayoutTests/ChangeLog 2011-10-28 16:47:14 UTC (rev 98731)
+++ trunk/LayoutTests/ChangeLog 2011-10-28 16:58:33 UTC (rev 98732)
@@ -1,3 +1,22 @@
+2011-10-28 Nate Chapin <[email protected]>
+
+ empty-urls.html needs to stop being flaky.
+ Because it was in http/tests/loading, it output
+ frame load callbacks, and it was unpredictable whether
+ the callback for onload or for the load completing would
+ be called first. Ergo, move the test to http/tests/misc,
+ and remove the logic which failed to enforce a frame load
+ callback ordering.
+ https://bugs.webkit.org/show_bug.cgi?id=67359
+
+ Reviewed by Adam Barth.
+
+ * http/tests/loading/empty-urls-expected.txt: Removed.
+ * http/tests/loading/empty-urls.html: Removed.
+ * http/tests/misc/empty-urls-expected.txt: Copied from LayoutTests/http/tests/loading/empty-urls-expected.txt.
+ * http/tests/misc/empty-urls.html: Copied from LayoutTests/http/tests/loading/empty-urls.html.
+ * platform/chromium/test_expectations.txt:
+
2011-10-28 Julien Chaffraix <[email protected]>
Unreviewed gardening.
Deleted: trunk/LayoutTests/http/tests/loading/empty-urls-expected.txt (98731 => 98732)
--- trunk/LayoutTests/http/tests/loading/empty-urls-expected.txt 2011-10-28 16:47:14 UTC (rev 98731)
+++ trunk/LayoutTests/http/tests/loading/empty-urls-expected.txt 2011-10-28 16:58:33 UTC (rev 98732)
@@ -1,12 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didFinishLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-PASS: img onerror fired
-PASS: input type=image onerror fired
-PASS: script onerror fired
-PASS: video src onerror fired
-PASS: audio onerror fired
-PASS: source onerror fired
-
Deleted: trunk/LayoutTests/http/tests/loading/empty-urls.html (98731 => 98732)
--- trunk/LayoutTests/http/tests/loading/empty-urls.html 2011-10-28 16:47:14 UTC (rev 98731)
+++ trunk/LayoutTests/http/tests/loading/empty-urls.html 2011-10-28 16:58:33 UTC (rev 98732)
@@ -1,60 +0,0 @@
-<html>
-<head>
-<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
-}
-
-var expectedPasses = 6;
-var messages = new Array();
-var currentMessageIndex = 0;
-var _onloadFired_ = false;
-
-function log(message)
-{
- document.getElementById("console").appendChild(document.createTextNode(message));
- document.getElementById("console").appendChild(document.createElement("br"));
-}
-
-function logPass(message, messageNumber)
-{
- messages[messageNumber] = 'PASS: ' + message;
-
- while (messages[currentMessageIndex]) {
- log(messages[currentMessageIndex]);
- currentMessageIndex++;
- }
-
- expectedPasses--;
- checkIfDone();
-}
-
-function checkIfDone()
-{
- if (expectedPasses == 0 && onloadFired && window.layoutTestController)
- layoutTestController.notifyDone();
-}
-</script>
-<link rel="icon" src="" href="" _onerror_="log('FAIL: link rel=icon onerror fired')"></link>
-<link rel="prefetch" src="" href="" _onerror_="log('FAIL: link rel=prefetch onerror fired')"></link>
-<link rel="stylesheet" src="" href="" _onerror_="log('FAIL: link rel=stylesheet onerror fired')"></link>
-</head>
-<body _onload_="setTimeout('_onloadFired_ = true; checkIfDone();', 0)">
-<div id="console"></div>
-<command icon="" _onerror_="log('FAIL: command onerror fired')"></command>
-<object data="" _onerror_="log('FAIL: object onerror fired')"></object>
-<embed src="" _onerror_="log('FAIL: embed onerror fired')"></embed>
-<video poster="" _onerror_="log('FAIL: video poster onerror fired')"></video>
-<img src="" _onerror_="logPass('img onerror fired', 0)"></img>
-<input type="image" src="" _onerror_="logPass('input type=image onerror fired', 1)"></input>
-<script src="" _onerror_="logPass('script onerror fired', 2)"></script>
-<video id="video" src="" _onerror_="logPass('video src onerror fired', 3)"></video>
-<audio id="audio" src="" _onerror_="logPass('audio onerror fired', 4)"></audio>
-<video><source src="" _onerror_="logPass('source onerror fired', 5)"></source></video>
-<script>
-document.getElementById("video").load();
-document.getElementById("audio").load();
-</script>
-</body>
-</html>
Added: trunk/LayoutTests/http/tests/misc/empty-urls-expected.txt (0 => 98732)
--- trunk/LayoutTests/http/tests/misc/empty-urls-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/misc/empty-urls-expected.txt 2011-10-28 16:58:33 UTC (rev 98732)
@@ -0,0 +1,7 @@
+PASS: img onerror fired
+PASS: input type=image onerror fired
+PASS: script onerror fired
+PASS: video src onerror fired
+PASS: audio onerror fired
+PASS: source onerror fired
+
Copied: trunk/LayoutTests/http/tests/misc/empty-urls.html (from rev 98731, trunk/LayoutTests/http/tests/loading/empty-urls.html) (0 => 98732)
--- trunk/LayoutTests/http/tests/misc/empty-urls.html (rev 0)
+++ trunk/LayoutTests/http/tests/misc/empty-urls.html 2011-10-28 16:58:33 UTC (rev 98732)
@@ -0,0 +1,54 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+}
+
+var expectedPasses = 6;
+var messages = new Array();
+var currentMessageIndex = 0;
+
+function log(message)
+{
+ document.getElementById("console").appendChild(document.createTextNode(message));
+ document.getElementById("console").appendChild(document.createElement("br"));
+}
+
+function logPass(message, messageNumber)
+{
+ messages[messageNumber] = 'PASS: ' + message;
+
+ while (messages[currentMessageIndex]) {
+ log(messages[currentMessageIndex]);
+ currentMessageIndex++;
+ }
+
+ expectedPasses--;
+ if (expectedPasses == 0 && window.layoutTestController)
+ layoutTestController.notifyDone();
+}
+</script>
+<link rel="icon" src="" href="" _onerror_="log('FAIL: link rel=icon onerror fired')"></link>
+<link rel="prefetch" src="" href="" _onerror_="log('FAIL: link rel=prefetch onerror fired')"></link>
+<link rel="stylesheet" src="" href="" _onerror_="log('FAIL: link rel=stylesheet onerror fired')"></link>
+</head>
+<body>
+<div id="console"></div>
+<command icon="" _onerror_="log('FAIL: command onerror fired')"></command>
+<object data="" _onerror_="log('FAIL: object onerror fired')"></object>
+<embed src="" _onerror_="log('FAIL: embed onerror fired')"></embed>
+<video poster="" _onerror_="log('FAIL: video poster onerror fired')"></video>
+<img src="" _onerror_="logPass('img onerror fired', 0)"></img>
+<input type="image" src="" _onerror_="logPass('input type=image onerror fired', 1)"></input>
+<script src="" _onerror_="logPass('script onerror fired', 2)"></script>
+<video id="video" src="" _onerror_="logPass('video src onerror fired', 3)"></video>
+<audio id="audio" src="" _onerror_="logPass('audio onerror fired', 4)"></audio>
+<video><source src="" _onerror_="logPass('source onerror fired', 5)"></source></video>
+<script>
+document.getElementById("video").load();
+document.getElementById("audio").load();
+</script>
+</body>
+</html>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (98731 => 98732)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-28 16:47:14 UTC (rev 98731)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-28 16:58:33 UTC (rev 98732)
@@ -3642,8 +3642,6 @@
// We don't seem to load this glyph on windows
BUGJAMESR WIN : fast/text/fallback-traits-fixup.html = IMAGE+TEXT
-BUGWK67359 : http/tests/loading/empty-urls.html = PASS TEXT
-
BUGWK67515 LINUX WIN : canvas/philip/tests/2d.shadow.canvas.alpha.html = TEXT
BUGCR54348 LINUX RELEASE : http/tests/security/xssAuditor/dom-write-innerHTML.html = PASS TEXT
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
