Title: [230590] trunk/LayoutTests
- Revision
- 230590
- Author
- [email protected]
- Date
- 2018-04-12 12:18:46 -0700 (Thu, 12 Apr 2018)
Log Message
Fix flakiness in insecure-iframe-in-main-frame.html
https://bugs.webkit.org/show_bug.cgi?id=184432
Reviewed by Daniel Bates.
Mark insecure-iframe-in-main-frame.html as no longer flaky. Tweak it
so that the frame-load events of the test window do no interleave with
the frame-load events of the window opened by the test so that any
non-deterministic behavior doesn't affect the order of the expect
sequence of messages.
* TestExpectations:
* http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt:
* http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame.html:
* platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (230589 => 230590)
--- trunk/LayoutTests/ChangeLog 2018-04-12 18:56:29 UTC (rev 230589)
+++ trunk/LayoutTests/ChangeLog 2018-04-12 19:18:46 UTC (rev 230590)
@@ -1,3 +1,21 @@
+2018-04-12 Keith Rollin <[email protected]>
+
+ Fix flakiness in insecure-iframe-in-main-frame.html
+ https://bugs.webkit.org/show_bug.cgi?id=184432
+
+ Reviewed by Daniel Bates.
+
+ Mark insecure-iframe-in-main-frame.html as no longer flaky. Tweak it
+ so that the frame-load events of the test window do no interleave with
+ the frame-load events of the window opened by the test so that any
+ non-deterministic behavior doesn't affect the order of the expect
+ sequence of messages.
+
+ * TestExpectations:
+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt:
+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame.html:
+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt:
+
2018-04-12 Ryan Haddad <[email protected]>
Unreviewed, rolling out r230554.
Modified: trunk/LayoutTests/TestExpectations (230589 => 230590)
--- trunk/LayoutTests/TestExpectations 2018-04-12 18:56:29 UTC (rev 230589)
+++ trunk/LayoutTests/TestExpectations 2018-04-12 19:18:46 UTC (rev 230590)
@@ -581,7 +581,6 @@
# These tests used to have deterministic load delegate callback order before webkit.org/b/160677
http/tests/svg/svg-use-external.html [ Pass Failure ]
http/tests/loading/text-content-type-with-binary-extension.html [ Pass Failure ]
-http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame.html [ Pass Failure ]
# Tests that are flakey due to unhandled promise rejection error messages
webkit.org/b/171094 streams/brand-checks.html [ Pass Failure ]
Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt (230589 => 230590)
--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt 2018-04-12 18:56:29 UTC (rev 230589)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt 2018-04-12 19:18:46 UTC (rev 230590)
@@ -1,7 +1,7 @@
-main frame - didStartProvisionalLoadForFrame
main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
+main frame - didStartProvisionalLoadForFrame
main frame - didCommitLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/resources/fail.html because 'block-all-mixed-content' appears in the Content Security Policy.
Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame.html (230589 => 230590)
--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame.html 2018-04-12 18:56:29 UTC (rev 230589)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame.html 2018-04-12 19:18:46 UTC (rev 230590)
@@ -31,7 +31,9 @@
mixed content block because the main frame in the window has CSP directive block-all-mixed-content.</p>
<pre id="console"></pre>
<script>
- window.open("https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-iframe.html");
+ window.setTimeout(function() {
+ window.open("https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-iframe.html");
+ }, 0);
</script>
</body>
</html>
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt (230589 => 230590)
--- trunk/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt 2018-04-12 18:56:29 UTC (rev 230589)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt 2018-04-12 19:18:46 UTC (rev 230590)
@@ -1,13 +1,13 @@
-main frame - didStartProvisionalLoadForFrame
main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
+main frame - didStartProvisionalLoadForFrame
main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/resources/fail.html because 'block-all-mixed-content' appears in the Content Security Policy.
+main frame - didHandleOnloadEventsForFrame
frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
This test opens a window and loads an insecure iframe. We should trigger a mixed content block because the main frame in the window has CSP directive block-all-mixed-content.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
