Title: [201472] trunk/LayoutTests
- Revision
- 201472
- Author
- [email protected]
- Date
- 2016-05-27 16:34:25 -0700 (Fri, 27 May 2016)
Log Message
Unreviewed test fix after r201468.
Correct output handling to reduce flakiness on test bots.
* http/tests/security/contentSecurityPolicy/frame-src-cross-origin-load.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (201471 => 201472)
--- trunk/LayoutTests/ChangeLog 2016-05-27 22:31:43 UTC (rev 201471)
+++ trunk/LayoutTests/ChangeLog 2016-05-27 23:34:25 UTC (rev 201472)
@@ -1,3 +1,11 @@
+2016-05-27 Brent Fulgham <[email protected]>
+
+ Unreviewed test fix after r201468.
+
+ Correct output handling to reduce flakiness on test bots.
+
+ * http/tests/security/contentSecurityPolicy/frame-src-cross-origin-load.html:
+
2016-05-26 Ryosuke Niwa <[email protected]>
Crash in TreeScope::focusedElement
Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-cross-origin-load.html (201471 => 201472)
--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-cross-origin-load.html 2016-05-27 22:31:43 UTC (rev 201471)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-cross-origin-load.html 2016-05-27 23:34:25 UTC (rev 201472)
@@ -4,19 +4,17 @@
<script src=""
<meta http-equiv="Content-Security-Policy" content="frame-src 'self' http://localhost:8080">
<script>
- if (window.testRunner)
- testRunner.waitUntilDone();
+ window.jsTestIsAsync = true;
description("IFrames blocked by CSP should generate a 'load' event, regardless of blocked state. This means they appear to be normal cross-origin loads, thereby not leaking URL information directly to JS.");
var loads = 0;
+
function loadEvent() {
loads++;
testPassed("IFrame #" + loads + " generated a 'load' event.");
- if (loads == 3) {
- if (window.testRunner)
- testRunner.notifyDone();
- }
+ if (loads == 3)
+ setTimeout(finishJSTest, 0);
}
</script>
</head>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
