Title: [182800] trunk/LayoutTests
Revision
182800
Author
[email protected]
Date
2015-04-14 10:30:42 -0700 (Tue, 14 Apr 2015)

Log Message

Two flaky tests in http/tests/security/mixedContent
https://bugs.webkit.org/show_bug.cgi?id=143695

Reviewed by Csaba Osztrogonác.

Speculative fix. Do not start opening a secondary window until fully done with the
main document.

* http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt:
* http/tests/security/mixedContent/data-url-iframe-in-main-frame.html:
* http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt:
* http/tests/security/mixedContent/insecure-css-in-main-frame.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (182799 => 182800)


--- trunk/LayoutTests/ChangeLog	2015-04-14 17:25:31 UTC (rev 182799)
+++ trunk/LayoutTests/ChangeLog	2015-04-14 17:30:42 UTC (rev 182800)
@@ -1,3 +1,18 @@
+2015-04-14  Alexey Proskuryakov  <[email protected]>
+
+        Two flaky tests in http/tests/security/mixedContent
+        https://bugs.webkit.org/show_bug.cgi?id=143695
+
+        Reviewed by Csaba Osztrogonác.
+
+        Speculative fix. Do not start opening a secondary window until fully done with the
+        main document.
+
+        * http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt:
+        * http/tests/security/mixedContent/data-url-iframe-in-main-frame.html:
+        * http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt:
+        * http/tests/security/mixedContent/insecure-css-in-main-frame.html:
+
 2015-04-13  Simon Fraser  <[email protected]>
 
         [iOS WK2] Interactive elements of developer.apple.com are broken

Modified: trunk/LayoutTests/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt (182799 => 182800)


--- trunk/LayoutTests/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt	2015-04-14 17:25:31 UTC (rev 182799)
+++ trunk/LayoutTests/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt	2015-04-14 17:30:42 UTC (rev 182800)
@@ -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/data-url-iframe-in-main-frame.html (182799 => 182800)


--- trunk/LayoutTests/http/tests/security/mixedContent/data-url-iframe-in-main-frame.html	2015-04-14 17:25:31 UTC (rev 182799)
+++ trunk/LayoutTests/http/tests/security/mixedContent/data-url-iframe-in-main-frame.html	2015-04-14 17:30:42 UTC (rev 182800)
@@ -19,7 +19,9 @@
 *not* trigger a mixed content callback because the data URL cannot be corrupted
 by active network attackers.</p>
 <script>
-window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-data-url-frame.html");
+_onload_ = function() {
+    window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-data-url-frame.html");
+}
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt (182799 => 182800)


--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt	2015-04-14 17:25:31 UTC (rev 182799)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt	2015-04-14 17:30:42 UTC (rev 182800)
@@ -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-css-in-main-frame.html (182799 => 182800)


--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame.html	2015-04-14 17:25:31 UTC (rev 182799)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame.html	2015-04-14 17:30:42 UTC (rev 182800)
@@ -19,7 +19,9 @@
 trigger a mixed content callback because the main frame in the window is HTTPS
 but is running insecure content.</p>
 <script>
-window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css.html");
+_onload_ = function() {
+    window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css.html");
+}
 </script>
 </body>
 </html>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to