Title: [189289] trunk/LayoutTests
- Revision
- 189289
- Author
- [email protected]
- Date
- 2015-09-03 14:48:27 -0700 (Thu, 03 Sep 2015)
Log Message
REGRESSION: http/tests/contentfiltering/block-after-redirect.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=148684
Reviewed by Alexey Proskuryakov.
Wait for the iframe to load the blocked page before finishing the test.
* http/tests/contentfiltering/block-after-redirect.html:
* platform/mac-wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (189288 => 189289)
--- trunk/LayoutTests/ChangeLog 2015-09-03 21:11:59 UTC (rev 189288)
+++ trunk/LayoutTests/ChangeLog 2015-09-03 21:48:27 UTC (rev 189289)
@@ -1,3 +1,15 @@
+2015-09-03 Andy Estes <[email protected]>
+
+ REGRESSION: http/tests/contentfiltering/block-after-redirect.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=148684
+
+ Reviewed by Alexey Proskuryakov.
+
+ Wait for the iframe to load the blocked page before finishing the test.
+
+ * http/tests/contentfiltering/block-after-redirect.html:
+ * platform/mac-wk2/TestExpectations:
+
2015-09-03 Tim Horton <[email protected]>
[Mac] Add support for testing swipes
Modified: trunk/LayoutTests/http/tests/contentfiltering/block-after-redirect.html (189288 => 189289)
--- trunk/LayoutTests/http/tests/contentfiltering/block-after-redirect.html 2015-09-03 21:11:59 UTC (rev 189288)
+++ trunk/LayoutTests/http/tests/contentfiltering/block-after-redirect.html 2015-09-03 21:48:27 UTC (rev 189289)
@@ -1,4 +1,5 @@
<!DOCTYPE html>
+<body>
<script>
if (window.internals) {
var settings = window.internals.mockContentFilterSettings;
@@ -7,6 +8,15 @@
settings.decision = settings.DECISION_BLOCK;
settings.blockedString = "<!DOCTYPE html><body>PASS";
}
+
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+var iframe = document.createElement("iframe");
+document.body.appendChild(iframe);
+iframe.addEventListener("load", function(event) {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, false);
+iframe.src = ""
</script>
-<body>
-<iframe src=""
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (189288 => 189289)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2015-09-03 21:11:59 UTC (rev 189288)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2015-09-03 21:48:27 UTC (rev 189289)
@@ -265,8 +265,6 @@
webkit.org/b/147075 [ Release Yosemite ] http/tests/cache/disk-cache/disk-cache-disable.html [ Pass Failure ]
-webkit.org/b/148684 http/tests/contentfiltering/block-after-redirect.html [ Pass ImageOnlyFailure ]
-
### END OF (1) Classified failures with bug reports
########################################
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
