Changeset 284708 in webkit

Timestamp:

Oct 22, 2021, 12:19:01 PM (5 years ago)

Author:

Eric Hutchison

Message:

Update test expectations for imported/w3c/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.
​https://bugs.webkit.org/show_bug.cgi?id=232120.

Unreviewed test gardening.

• platform/ios-wk2/TestExpectations:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• platform/ios-wk2/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-22  Eric Hutchison  <ehutchison@apple.com>
+
+        Update test expectations for imported/w3c/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.
+        https://bugs.webkit.org/show_bug.cgi?id=232120.
+
+        Unreviewed test gardening.
+
+        * platform/ios-wk2/TestExpectations:
+
 2021-10-22  Eric Hutchison  <ehutchison@apple.com>
 

trunk/LayoutTests/platform/ios-wk2/TestExpectations

@@ -2233 +2233 @@
 webkit.org/b/232102 http/tests/privateClickMeasurement/attribution-conversion-through-image-redirect-with-priority.html [ Pass Crash ]
 
-webkit.org/b/232120 imported/w3c/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html [ Pass Failure ]
-
-<<<<<<< HEAD
+webkit.org/b/232120 imported/w3c/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html [ Pass Failure DumpJSConsoleLogInStdErr ]
+
 webkit.org/b/232151 http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html [ Failure ]
 webkit.org/b/232151 imported/w3c/web-platform-tests/html/browsers/the-window-object/noopener-noreferrer-sizing.window.html  [ Pass Failure ]
-=======
+
 webkit.org/b/225528 http/wpt/fetch/fetch-response-body-stop-in-worker.html [ Pass Crash ]
-
->>>>>>> c59bb0784b05 (http/wpt/fetch/fetch-response-body-stop-in-worker.html is failing on iOS15 was well.)