Title: [106896] trunk/LayoutTests
- Revision
- 106896
- Author
- [email protected]
- Date
- 2012-02-06 19:52:01 -0800 (Mon, 06 Feb 2012)
Log Message
http/tests/security/mixedContent/insecure-script-in-iframe.html flaky in chromium debug
https://bugs.webkit.org/show_bug.cgi?id=65567
Reviewed by Eric Seidel.
My theory is that the extra log message is caused by the preload
scanner requesting the script, which might occur if the test is running
extremely slowly (as it might on a debug bot).
This patch simplifies the test in the hopes of removing the flakiness.
* http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt:
* http/tests/security/mixedContent/insecure-script-in-iframe.html:
* http/tests/security/mixedContent/resources/frame-with-insecure-script.html:
* platform/chromium/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (106895 => 106896)
--- trunk/LayoutTests/ChangeLog 2012-02-07 03:20:31 UTC (rev 106895)
+++ trunk/LayoutTests/ChangeLog 2012-02-07 03:52:01 UTC (rev 106896)
@@ -1,5 +1,23 @@
2012-02-06 Adam Barth <[email protected]>
+ http/tests/security/mixedContent/insecure-script-in-iframe.html flaky in chromium debug
+ https://bugs.webkit.org/show_bug.cgi?id=65567
+
+ Reviewed by Eric Seidel.
+
+ My theory is that the extra log message is caused by the preload
+ scanner requesting the script, which might occur if the test is running
+ extremely slowly (as it might on a debug bot).
+
+ This patch simplifies the test in the hopes of removing the flakiness.
+
+ * http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt:
+ * http/tests/security/mixedContent/insecure-script-in-iframe.html:
+ * http/tests/security/mixedContent/resources/frame-with-insecure-script.html:
+ * platform/chromium/test_expectations.txt:
+
+2012-02-06 Adam Barth <[email protected]>
+
http/tests/security/mixedContent/insecure-image-in-main-frame.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=77904
Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt (106895 => 106896)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt 2012-02-07 03:20:31 UTC (rev 106895)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt 2012-02-07 03:52:01 UTC (rev 106896)
@@ -1,14 +1,5 @@
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-script.html ran insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js.
-didRunInsecureContent
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
This test loads a secure iframe that loads an insecure script. We should trigger a mixed content callback even though the main frame is HTTP because the HTTPS frame's origin is contaminated with an insecure script.
Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe.html (106895 => 106896)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe.html 2012-02-07 03:20:31 UTC (rev 106895)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe.html 2012-02-07 03:52:01 UTC (rev 106896)
@@ -1,15 +1,12 @@
<html>
<body>
<script>
-if (window.layoutTestController) {
+if (window.layoutTestController)
layoutTestController.dumpAsText();
- layoutTestController.dumpFrameLoadCallbacks();
-}
</script>
<p>This test loads a secure iframe that loads an insecure script. We should
trigger a mixed content callback even though the main frame is HTTP because the
HTTPS frame's origin is contaminated with an insecure script.</p>
-<iframe src=""
-></iframe>
+<iframe src=""
</body>
</html>
Modified: trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-script.html (106895 => 106896)
--- trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-script.html 2012-02-07 03:20:31 UTC (rev 106895)
+++ trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-script.html 2012-02-07 03:52:01 UTC (rev 106896)
@@ -1,9 +1,7 @@
-<body _onload_="frameLoaded()">
+<script src=""
<script>
-function frameLoaded() {
- if (window.opener)
- window.opener.postMessage('done', '*');
-}
+window._onload_ = function() {
+ if (window.opener)
+ window.opener.postMessage('done', '*');
+};
</script>
-<script src=""
-</body>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (106895 => 106896)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-07 03:20:31 UTC (rev 106895)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-07 03:52:01 UTC (rev 106896)
@@ -772,7 +772,6 @@
// Flaky: fails about 5% of the time.
BUGCR31342 WIN RELEASE : security/block-test-no-port.html = PASS TEXT
-BUGWK65567 DEBUG : http/tests/security/mixedContent/insecure-script-in-iframe.html = PASS TEXT
BUGCR20345 : http/tests/security/cross-frame-access-getOwnPropertyDescriptor.html = TEXT
BUGCR42044 WIN : http/tests/security/xss-DENIED-mime-type-execute-as-html.html = PASS TIMEOUT
BUGWK42769 : http/tests/security/401-logout/401-logout.php = TIMEOUT
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
