Title: [106894] trunk/LayoutTests
- Revision
- 106894
- Author
- [email protected]
- Date
- 2012-02-06 19:11:29 -0800 (Mon, 06 Feb 2012)
Log Message
http/tests/security/mixedContent/insecure-image-in-main-frame.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=77904
Reviewed by Darin Adler.
My theory is that the extra log message is caused by the preload
scanner requesting the image, 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-image-in-main-frame-expected.txt:
* http/tests/security/mixedContent/insecure-image-in-main-frame.html:
* http/tests/security/mixedContent/resources/frame-with-insecure-image.html:
* platform/chromium/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (106893 => 106894)
--- trunk/LayoutTests/ChangeLog 2012-02-07 02:55:24 UTC (rev 106893)
+++ trunk/LayoutTests/ChangeLog 2012-02-07 03:11:29 UTC (rev 106894)
@@ -1,3 +1,21 @@
+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
+
+ Reviewed by Darin Adler.
+
+ My theory is that the extra log message is caused by the preload
+ scanner requesting the image, 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-image-in-main-frame-expected.txt:
+ * http/tests/security/mixedContent/insecure-image-in-main-frame.html:
+ * http/tests/security/mixedContent/resources/frame-with-insecure-image.html:
+ * platform/chromium/test_expectations.txt:
+
2012-02-06 David Grogan <[email protected]>
Port some indexeddb layout tests to workers.
Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt (106893 => 106894)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt 2012-02-07 02:55:24 UTC (rev 106893)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt 2012-02-07 03:11:29 UTC (rev 106894)
@@ -1,12 +1,3 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didCommitLoadForFrame
CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html displayed insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
-didDisplayInsecureContent
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
This test opens a window that loads an insecure image. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.
Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html (106893 => 106894)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html 2012-02-07 02:55:24 UTC (rev 106893)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html 2012-02-07 03:11:29 UTC (rev 106894)
@@ -4,14 +4,13 @@
if (window.layoutTestController) {
layoutTestController.waitUntilDone();
layoutTestController.dumpAsText();
- layoutTestController.dumpFrameLoadCallbacks();
layoutTestController.setCanOpenWindows();
layoutTestController.setCloseRemainingWindowsWhenComplete(true);
}
window.addEventListener("message", function (e) {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
}, false);
</script>
Modified: trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-image.html (106893 => 106894)
--- trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-image.html 2012-02-07 02:55:24 UTC (rev 106893)
+++ trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-image.html 2012-02-07 03:11:29 UTC (rev 106894)
@@ -1,11 +1,7 @@
-<html>
-<body _onload_="frameLoaded()">
+<img src=""
<script>
-function frameLoaded() {
- if (window.opener)
- window.opener.postMessage('done', '*');
-}
+window._onload_ = function() {
+ if (window.opener)
+ window.opener.postMessage('done', '*');
+};
</script>
-<img src=""
-</body>
-</html>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (106893 => 106894)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-07 02:55:24 UTC (rev 106893)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-07 03:11:29 UTC (rev 106894)
@@ -777,7 +777,6 @@
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
BUGDPRANKE WIN : http/tests/security/credentials-in-referer.html = PASS TIMEOUT
-BUG_LEVIN DEBUG : http/tests/security/mixedContent/insecure-image-in-main-frame.html = PASS TEXT
BUGWK70298 : http/tests/security/xssAuditor/cookie-injection.html = TEXT PASS
BUGCR24182 WIN RELEASE : http/tests/security/cross-origin-css.html = PASS TIMEOUT
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
