[ Mac WK2 ] Layout Test http/tests/security/contentSecurityPolicy/block-all-mixed...
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Mar 2019 01:58:13 +0000 (01:58 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Mar 2019 01:58:13 +0000 (01:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=194350
<rdar://problem/47937466>

Reviewed by Alex Christensen.

Bypass the HTMLPreloadScanner in the test or compass.jpg resource may end up getting loaded twice and log extra
lines in the test output.

* http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt:
* http/tests/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-with-enforced-and-report-policies.php:
* platform/mac-wk2/TestExpectations:
* platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt:

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

LayoutTests/ChangeLog
LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt
LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-with-enforced-and-report-policies.php
LayoutTests/platform/mac-wk2/TestExpectations
LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt

index f5e853d..0b6b8ef 100644 (file)
@@ -1,3 +1,19 @@
+2019-03-21  Chris Dumez  <cdumez@apple.com>
+
+        [ Mac WK2 ] Layout Test http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=194350
+        <rdar://problem/47937466>
+
+        Reviewed by Alex Christensen.
+
+        Bypass the HTMLPreloadScanner in the test or compass.jpg resource may end up getting loaded twice and log extra
+        lines in the test output.
+
+        * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt:
+        * http/tests/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-with-enforced-and-report-policies.php:
+        * platform/mac-wk2/TestExpectations:
+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt:
+
 2019-03-21  Simon Fraser  <simon.fraser@apple.com>
 
         Unreviewed test gardening.
index 38e8ffb..a4f7560 100644 (file)
@@ -23,9 +23,9 @@ blockedURI: http://127.0.0.1:8000
 violatedDirective: block-all-mixed-content
 effectiveDirective: block-all-mixed-content
 originalPolicy: block-all-mixed-content
-sourceFile: 
-lineNumber: 0
-columnNumber: 0
+sourceFile: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-with-enforced-and-report-policies.php
+lineNumber: 9
+columnNumber: 15
 statusCode: 0
 
 
index da02351..25d1a51 100644 (file)
@@ -8,6 +8,9 @@
 <script src="dump-securitypolicyviolation-and-notify-done.js"></script>
 </head>
 <body>
-<img src="http://127.0.0.1:8000/security/resources/compass.jpg">
+<script>
+// Use document.write() to bypass the HTMLPreloadScanner and address flakiness.
+document.write('<img src="http://127.0.0.1:8000/security/resources/compass.jpg">');
+</script>
 </body>
 </html>
index 5430647..5a58de8 100644 (file)
@@ -918,6 +918,4 @@ webkit.org/b/194368 http/tests/workers/service/basic-register-exceptions.html [
 
 webkit.org/b/194253 scrollingcoordinator/scrolling-tree/fixed-inside-frame.html [ Pass Failure ]
 
-webkit.org/b/194350 http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies.html [ Pass Failure ]
-
 webkit.org/b/194916 fast/mediastream/MediaStream-video-element.html [ Pass Failure ]
index c2e38b0..e719a6b 100644 (file)
@@ -23,9 +23,9 @@ blockedURI: http://127.0.0.1:8000
 violatedDirective: block-all-mixed-content
 effectiveDirective: block-all-mixed-content
 originalPolicy: block-all-mixed-content
-sourceFile: 
-lineNumber: 0
-columnNumber: 0
+sourceFile: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-with-enforced-and-report-policies.php
+lineNumber: 9
+columnNumber: 15
 statusCode: 0