Title: [139703] trunk/LayoutTests
- Revision
- 139703
- Author
- [email protected]
- Date
- 2013-01-14 18:49:41 -0800 (Mon, 14 Jan 2013)
Log Message
fast/dom/HTMLTemplateElement/inertContents.html is flaky on Debug Chromium bots
https://bugs.webkit.org/show_bug.cgi?id=106810
Reviewed by Levi Weintraub.
This patch reverts the test for inertContents back to a non-flaky version which did not
attempt to assert that images are prevented from loaded.
* fast/dom/HTMLTemplateElement/inertContents-expected.txt:
* fast/dom/HTMLTemplateElement/inertContents.html:
* platform/chromium/TestExpectations:
* platform/efl/fast/dom/HTMLTemplateElement/inertContents-expected.txt: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (139702 => 139703)
--- trunk/LayoutTests/ChangeLog 2013-01-15 02:45:24 UTC (rev 139702)
+++ trunk/LayoutTests/ChangeLog 2013-01-15 02:49:41 UTC (rev 139703)
@@ -1,3 +1,18 @@
+2013-01-14 Rafael Weinstein <[email protected]>
+
+ fast/dom/HTMLTemplateElement/inertContents.html is flaky on Debug Chromium bots
+ https://bugs.webkit.org/show_bug.cgi?id=106810
+
+ Reviewed by Levi Weintraub.
+
+ This patch reverts the test for inertContents back to a non-flaky version which did not
+ attempt to assert that images are prevented from loaded.
+
+ * fast/dom/HTMLTemplateElement/inertContents-expected.txt:
+ * fast/dom/HTMLTemplateElement/inertContents.html:
+ * platform/chromium/TestExpectations:
+ * platform/efl/fast/dom/HTMLTemplateElement/inertContents-expected.txt: Removed.
+
2013-01-14 Levi Weintraub <[email protected]>
Unreviewed gardening. Adding mac expectatons after r139686.
Modified: trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents-expected.txt (139702 => 139703)
--- trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents-expected.txt 2013-01-15 02:45:24 UTC (rev 139702)
+++ trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents-expected.txt 2013-01-15 02:49:41 UTC (rev 139703)
@@ -1,7 +1,11 @@
-http://foo.com/shouldLoad.jpg - willSendRequest <NSURLRequest URL http://foo.com/shouldLoad.jpg, main document URL inertContents.html, http method GET> redirectResponse (null)
-Blocked access to external URL http://foo.com/shouldLoad.jpg
-http://foo.com/shouldLoad.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "(null)">
-The test asserts that elements within template contents are "inert", e.g. resources do not fetch, script does not run.
+The test asserts that elements within template contents are "inert", e.g. script does not run.
-Before template content insertion: script did not run, after template content insertion: script did run.
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS testVal is "script has not run"
+PASS testVal is "script has run"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Modified: trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents.html (139702 => 139703)
--- trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents.html 2013-01-15 02:45:24 UTC (rev 139702)
+++ trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents.html 2013-01-15 02:49:41 UTC (rev 139703)
@@ -1,29 +1,17 @@
+<!DOCTYPE html>
<body>
-<p>The test asserts that elements within template contents are "inert", e.g. resources do not fetch, script does not run.</p>
-<template id="template"><script>window.testVal = "script did run";</script><img src=""
-<div id="output">
-</div>
-
+<script src=""
<script>
-var testVal = "script did not run";
-
-window._onload_ = function() {
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpResourceLoadCallbacks();
- }
-
- var output = document.getElementById('output');
- output.innerHTML = 'Before template content insertion: ' + testVal;
-
- var templateContent = document.getElementById('template').content;
- var img = templateContent.childNodes[1];
- img.src = ""
- document.body.appendChild(templateContent);
-
- output.innerHTML += ', after template content insertion: ' + testVal + '.';
-}
+var testVal = 'script has not run';
</script>
-</head>
-<body>
+<!-- FIXME: Add non-flaky test for <img> tags -->
+<template><script>window.testVal = 'script has run';</script></template>
+<script>
+description('The test asserts that elements within template contents are "inert", e.g. script does not run.');
+shouldBeEqualToString('testVal', 'script has not run');
+var templateContent = document.querySelector('template').content;
+document.body.appendChild(templateContent);
+shouldBeEqualToString('testVal', 'script has run');
+</script>
+<script src=""
</body>
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (139702 => 139703)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2013-01-15 02:45:24 UTC (rev 139702)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2013-01-15 02:49:41 UTC (rev 139703)
@@ -4365,5 +4365,4 @@
Bug(schenney) svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t.svg [ ImageOnlyFailure ]
Bug(schenney) svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t.svg [ ImageOnlyFailure ]
-webkit.org/b/106810 [ Debug ] fast/dom/HTMLTemplateElement/inertContents.html [ Pass Failure ]
webkit.org/b/106833 fast/borders/outline-alpha-inline.html [ Pass ImageOnlyFailure ]
Deleted: trunk/LayoutTests/platform/efl/fast/dom/HTMLTemplateElement/inertContents-expected.txt (139702 => 139703)
--- trunk/LayoutTests/platform/efl/fast/dom/HTMLTemplateElement/inertContents-expected.txt 2013-01-15 02:45:24 UTC (rev 139702)
+++ trunk/LayoutTests/platform/efl/fast/dom/HTMLTemplateElement/inertContents-expected.txt 2013-01-15 02:49:41 UTC (rev 139703)
@@ -1,7 +0,0 @@
-http://foo.com/shouldLoad.jpg - willSendRequest <NSURLRequest URL http://foo.com/shouldLoad.jpg, main document URL inertContents.html, http method GET> redirectResponse (null)
-Blocked access to external URL http://foo.com/shouldLoad.jpg
-http://foo.com/shouldLoad.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999>
-The test asserts that elements within template contents are "inert", e.g. resources do not fetch, script does not run.
-
-Before template content insertion: script did not run, after template content insertion: script did run.
-
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
