Title: [137769] trunk/LayoutTests
- Revision
- 137769
- Author
- ad...@chromium.org
- Date
- 2012-12-14 14:11:18 -0800 (Fri, 14 Dec 2012)
Log Message
fast/dom/HTMLTemplateElement/inertContents.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=104023
Reviewed by Eric Seidel.
Made the test only check inertness using <script>, since
<img>s are currently flaky due to the preload scanner.
* fast/dom/HTMLTemplateElement/inertContents-expected.txt:
* fast/dom/HTMLTemplateElement/inertContents.html:
* platform/chromium/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (137768 => 137769)
--- trunk/LayoutTests/ChangeLog 2012-12-14 22:07:32 UTC (rev 137768)
+++ trunk/LayoutTests/ChangeLog 2012-12-14 22:11:18 UTC (rev 137769)
@@ -1,3 +1,17 @@
+2012-12-14 Adam Klein <ad...@chromium.org>
+
+ fast/dom/HTMLTemplateElement/inertContents.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=104023
+
+ Reviewed by Eric Seidel.
+
+ Made the test only check inertness using <script>, since
+ <img>s are currently flaky due to the preload scanner.
+
+ * fast/dom/HTMLTemplateElement/inertContents-expected.txt:
+ * fast/dom/HTMLTemplateElement/inertContents.html:
+ * platform/chromium/TestExpectations:
+
2012-12-14 Anton Vayvod <avay...@chromium.org>
Consider inline-block and inline-table elements to be autosizing clusters.
Modified: trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents-expected.txt (137768 => 137769)
--- trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents-expected.txt 2012-12-14 22:07:32 UTC (rev 137768)
+++ trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents-expected.txt 2012-12-14 22:11:18 UTC (rev 137769)
@@ -1,7 +1,11 @@
-http://baz.com/bat.jpg - willSendRequest <NSURLRequest URL http://baz.com/bat.jpg, main document URL inertContents.html, http method GET> redirectResponse (null)
-Blocked access to external URL http://baz.com/bat.jpg
-http://baz.com/bat.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.
-pass!
+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 (137768 => 137769)
--- trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents.html 2012-12-14 22:07:32 UTC (rev 137768)
+++ trunk/LayoutTests/fast/dom/HTMLTemplateElement/inertContents.html 2012-12-14 22:11:18 UTC (rev 137769)
@@ -1,35 +1,17 @@
<!DOCTYPE html>
-<html>
-<head>
+<body>
+<script src=""
<script>
-var testVal = 1;
-
-window._onload_ = function() {
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpResourceLoadCallbacks();
- }
-
- if (testVal != 1)
- return;
-
- var templateContent = document.getElementById('template').content;
- var img = templateContent.childNodes[1];
- img.src = ""
- document.body.appendChild(templateContent);
-
- if (testVal != 2)
- return;
-
- document.getElementById('output').innerText = 'pass!';
-}
+var testVal = 'script has not run';
</script>
-</head>
-<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 = 2;</script><img src=""
-</template>
-<div id="output">
-</div>
+<!-- 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>
-</html>
\ No newline at end of file
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (137768 => 137769)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-12-14 22:07:32 UTC (rev 137768)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-12-14 22:11:18 UTC (rev 137769)
@@ -4180,8 +4180,6 @@
webkit.org/b/99800 fast/harness/perftests/perf-runner-compute-statistics.html [ Failure Pass ]
webkit.org/b/99800 fast/harness/perftests/runs-per-second-log.html [ Failure ImageOnlyFailure Missing Pass ]
-webkit.org/b/104023 [ Win Mac Debug ] fast/dom/HTMLTemplateElement/inertContents.html [ Failure Pass ]
-
# Needs platform-specific results
webkit.org/b/104035 fast/text/orientation-sideways.html [ Missing ]
webkit.org/b/104172 fast/text/decorations-with-text-combine.html [ Missing ]
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
