From 68b29e9ab725d81154b590ea5494a29aa439a0d5 Mon Sep 17 00:00:00 2001 From: Yutaka Hirano Date: Tue, 30 Jun 2020 09:29:29 +0000 Subject: [PATCH] Fix wpt/html/coep/require-corp-about-{blank,srcdoc}.html - platform/mac-mac10.13/.../require-corp-about-blank-expected.txt is redundant - it's same as the base expectation. - platform/mac-mac10.14/.../require-corp-about-blank-expected.txt is wrong - the test always fails on the platform (and the failures are suppressed by TestExpectations). - wpt/html/coep/require-corp-about-blank.html always fails because COEP is only effective on secure contexts (https://github.com/whatwg/html/issues/4930). Rename it to wpt/html/coep/require-corp-about-blank.https.html - wpt/html/coep/require-corp-about-srcdoc.html always fails because COEP is only effective on secure contexts (https://github.com/whatwg/html/issues/4930). Rename it to wpt/html/coep/require-corp-about-srcdoc.https.html - Remove redundant TestExpectations entries. Bug: 1086065, 626703 Change-Id: I5573dd4446f482acdde828404e0a88893897ce09 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2274133 Auto-Submit: Yutaka Hirano Reviewed-by: Makoto Shimazu Commit-Queue: Yutaka Hirano Cr-Original-Commit-Position: refs/heads/master@{#783875} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 34c0036a47c782ddd4528a37a25394f7acfd8939 --- blink/web_tests/TestExpectations | 6 ------ .../require-corp-about-blank-expected.txt | 6 ------ ...ut-blank.html => require-corp-about-blank.https.html} | 0 ...aders => require-corp-about-blank.https.html.headers} | 0 .../require-corp-about-srcdoc-expected.txt | 6 ------ ...-srcdoc.html => require-corp-about-srcdoc.https.html} | 0 ...ders => require-corp-about-srcdoc.https.html.headers} | 0 .../require-corp-about-blank-expected.txt | 6 ------ .../require-corp-about-blank-expected.txt | 9 --------- 9 files changed, 33 deletions(-) delete mode 100644 blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt rename blink/web_tests/external/wpt/html/cross-origin-embedder-policy/{require-corp-about-blank.html => require-corp-about-blank.https.html} (100%) rename blink/web_tests/external/wpt/html/cross-origin-embedder-policy/{require-corp-about-blank.html.headers => require-corp-about-blank.https.html.headers} (100%) delete mode 100644 blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc-expected.txt rename blink/web_tests/external/wpt/html/cross-origin-embedder-policy/{require-corp-about-srcdoc.html => require-corp-about-srcdoc.https.html} (100%) rename blink/web_tests/external/wpt/html/cross-origin-embedder-policy/{require-corp-about-srcdoc.html.headers => require-corp-about-srcdoc.https.html.headers} (100%) delete mode 100644 blink/web_tests/platform/mac-mac10.13/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt delete mode 100644 blink/web_tests/platform/mac-mac10.14/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt diff --git a/blink/web_tests/TestExpectations b/blink/web_tests/TestExpectations index ae2b1e8f41bd..f9d935a70fd6 100644 --- a/blink/web_tests/TestExpectations +++ b/blink/web_tests/TestExpectations @@ -2731,12 +2731,6 @@ crbug.com/626703 [ Mac10.10 ] virtual/cache-storage-sequence/external/wpt/servic crbug.com/626703 [ Mac10.10 ] virtual/cache-storage-eager-reading/external/wpt/service-workers/service-worker/about-blank-replacement.https.html [ Timeout ] crbug.com/626703 [ Mac10.10 ] virtual/cache-storage-sequence/external/wpt/service-workers/service-worker/fetch-response-taint.https.html [ Timeout ] crbug.com/626703 [ Mac10.10 ] virtual/cache-storage-eager-reading/external/wpt/service-workers/service-worker/service-worker-csp-script.https.html [ Timeout ] -crbug.com/626703 [ Mac10.13 ] external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.html [ Failure Timeout ] -crbug.com/626703 [ Mac10.14 ] external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.html [ Failure Timeout ] -crbug.com/626703 [ Mac10.15 ] external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.html [ Failure Timeout ] -crbug.com/626703 [ Retina ] external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.html [ Failure Timeout ] -crbug.com/626703 [ Mac10.13 ] external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc.html [ Failure Timeout ] -crbug.com/626703 [ Mac10.15 ] external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc.html [ Failure Timeout ] crbug.com/626703 [ Linux ] external/wpt/streams/idlharness.any.serviceworker.html [ Timeout ] crbug.com/626703 [ Mac ] external/wpt/streams/idlharness.any.serviceworker.html [ Timeout ] crbug.com/626703 [ Win ] external/wpt/streams/idlharness.any.serviceworker.html [ Timeout ] diff --git a/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt b/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt deleted file mode 100644 index ece776d2d617..000000000000 --- a/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -This is a testharness.js-based test. -PASS Wait for the DOM to be built. -PASS about:blank can always be embedded by a 'require-corp' document -FAIL A(B(C)) A=require-corp, B=about:blank, C=no-require-corp => C can't load wait_for: Timed out waiting on condition -Harness: the test ran to completion. - diff --git a/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.html b/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.https.html similarity index 100% rename from blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.html rename to blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.https.html diff --git a/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.html.headers b/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.https.html.headers similarity index 100% rename from blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.html.headers rename to blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank.https.html.headers diff --git a/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc-expected.txt b/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc-expected.txt deleted file mode 100644 index 03c79497e0ce..000000000000 --- a/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -This is a testharness.js-based test. -PASS Wait for the DOM to be built. -PASS about:srcdoc can always be embedded by a 'require-corp' document -FAIL A(B(C)) A=require-corp, B=about:srcdoc, C=no-require-corp => C can't load wait_for: Timed out waiting on condition -Harness: the test ran to completion. - diff --git a/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc.html b/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html similarity index 100% rename from blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc.html rename to blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html diff --git a/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc.html.headers b/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html.headers similarity index 100% rename from blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc.html.headers rename to blink/web_tests/external/wpt/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html.headers diff --git a/blink/web_tests/platform/mac-mac10.13/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt b/blink/web_tests/platform/mac-mac10.13/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt deleted file mode 100644 index ece776d2d617..000000000000 --- a/blink/web_tests/platform/mac-mac10.13/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -This is a testharness.js-based test. -PASS Wait for the DOM to be built. -PASS about:blank can always be embedded by a 'require-corp' document -FAIL A(B(C)) A=require-corp, B=about:blank, C=no-require-corp => C can't load wait_for: Timed out waiting on condition -Harness: the test ran to completion. - diff --git a/blink/web_tests/platform/mac-mac10.14/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt b/blink/web_tests/platform/mac-mac10.14/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt deleted file mode 100644 index 1fbd9f62a831..000000000000 --- a/blink/web_tests/platform/mac-mac10.14/external/wpt/html/cross-origin-embedder-policy/require-corp-about-blank-expected.txt +++ /dev/null @@ -1,9 +0,0 @@ -Content-Type: text/plain -This is a testharness.js-based test. -PASS Wait for the DOM to be built. -PASS about:blank can always be embedded by a 'require-corp' document -FAIL A(B(C)) A=require-corp, B=about:blank, C=no-require-corp => C can't load wait_for: Timed out waiting on condition -Harness: the test ran to completion. - -#EOF -#EOF