REGRESSION: http/tests/contentfiltering/block-after-redirect.html is flaky
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Sep 2015 21:48:27 +0000 (21:48 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Sep 2015 21:48:27 +0000 (21:48 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189289 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/http/tests/contentfiltering/block-after-redirect.html
LayoutTests/platform/mac-wk2/TestExpectations

index 0c62a9e..199dfaa 100644 (file)
@@ -1,3 +1,15 @@
+2015-09-03  Andy Estes  <aestes@apple.com>
+
+        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  <timothy_horton@apple.com>
 
         [Mac] Add support for testing swipes
index d55aa88..6a65b32 100644 (file)
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<body>
 <script>
 if (window.internals) {
     var settings = window.internals.mockContentFilterSettings;
@@ -7,6 +8,15 @@ if (window.internals) {
     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 = "/resources/redirect.php?url=/contentfiltering/resources/fail.html";
 </script>
-<body>
-<iframe src="/resources/redirect.php?url=/contentfiltering/resources/fail.html"></iframe>
index 02019d4..345bedf 100644 (file)
@@ -265,8 +265,6 @@ webkit.org/b/145432 media/video-transformed-by-javascript.html [ Failure ]
 
 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
 ########################################