Diff
Modified: trunk/LayoutTests/ChangeLog (182892 => 182893)
--- trunk/LayoutTests/ChangeLog 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/ChangeLog 2015-04-16 17:30:20 UTC (rev 182893)
@@ -1,3 +1,25 @@
+2015-04-16 Alexey Proskuryakov <a...@apple.com>
+
+ More flaky tests in http/tests/security/mixedContent
+ https://bugs.webkit.org/show_bug.cgi?id=143804
+
+ Reviewed by Csaba Osztrogonác.
+
+ Start secondary window loading in onload, so that it doesn't race with main document
+ finishing to load.
+
+ * http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt:
+ * http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html:
+ * http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html:
+ * http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt:
+ * http/tests/security/mixedContent/insecure-iframe-in-main-frame.html:
+ * http/tests/security/mixedContent/insecure-image-in-main-frame.html:
+ * http/tests/security/mixedContent/insecure-xhr-in-main-frame.html:
+ * http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt:
+ * http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html:
+ * http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt:
+ * http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html:
+
2015-04-15 Chris Dumez <cdu...@apple.com>
Add a console message when a stylesheet is not parsed due to invalid MIME type
Modified: trunk/LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt 2015-04-16 17:30:20 UTC (rev 182893)
@@ -1,5 +1,5 @@
+main frame - didFinishDocumentLoadForFrame
main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
main frame - didCommitLoadForFrame
Modified: trunk/LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html 2015-04-16 17:30:20 UTC (rev 182893)
@@ -19,7 +19,9 @@
*not* trigger a mixed content callback because the about:blank iframes cannot
be corrupted by active network attackers.</p>
<script>
-window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-about-blank-frame.html");
+_onload_ = function() {
+ window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-about-blank-frame.html");
+}
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html 2015-04-16 17:30:20 UTC (rev 182893)
@@ -18,7 +18,9 @@
trigger a mixed content callback because the main frame in the window is HTTPS but is
displaying insecure content.</p>
<script>
-window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-audio-video.html");
+_onload_ = function() {
+ window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-audio-video.html");
+}
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt 2015-04-16 17:30:20 UTC (rev 182893)
@@ -1,5 +1,5 @@
+main frame - didFinishDocumentLoadForFrame
main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
main frame - didCommitLoadForFrame
Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame.html (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame.html 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame.html 2015-04-16 17:30:20 UTC (rev 182893)
@@ -19,7 +19,9 @@
mixed content callback because the main frame in the window is HTTPS but is
displaying insecure content.</p>
<script>
-window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-frame.html");
+_onload_ = function() {
+ window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-frame.html");
+}
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html 2015-04-16 17:30:20 UTC (rev 182893)
@@ -18,7 +18,9 @@
mixed content callback because the main frame in the window is HTTPS but is
displaying insecure content.</p>
<script>
-window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html");
+_onload_ = function() {
+ window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html");
+}
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame.html (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame.html 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame.html 2015-04-16 17:30:20 UTC (rev 182893)
@@ -20,7 +20,9 @@
trigger a mixed content callback because the main frame in the window is HTTPS but
now has insecure data.</p>
<script>
-window.open("https://127.0.0.1:8443/xmlhttprequest/access-control-response-with-body.html");
+_onload_ = function() {
+ window.open("https://127.0.0.1:8443/xmlhttprequest/access-control-response-with-body.html");
+}
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt 2015-04-16 17:30:20 UTC (rev 182893)
@@ -1,5 +1,5 @@
+main frame - didFinishDocumentLoadForFrame
main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
main frame - didCommitLoadForFrame
Modified: trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html 2015-04-16 17:30:20 UTC (rev 182893)
@@ -22,7 +22,9 @@
in the window is HTTPS but is displaying content that can be controlled by an
active network attacker.</p>
<script>
-window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-frame.html");
+_onload_ = function() {
+ window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-frame.html");
+}
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt 2015-04-16 17:30:20 UTC (rev 182893)
@@ -1,5 +1,5 @@
+main frame - didFinishDocumentLoadForFrame
main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
main frame - didCommitLoadForFrame
Modified: trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html (182892 => 182893)
--- trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html 2015-04-16 17:28:34 UTC (rev 182892)
+++ trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html 2015-04-16 17:30:20 UTC (rev 182893)
@@ -22,7 +22,9 @@
in the window is HTTPS but is displaying content that can be controlled by an
active network attacker.</p>
<script>
-window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-frame.html");
+_onload_ = function() {
+ window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-frame.html");
+}
</script>
</body>
