Skip to content

Commit

Permalink
Import wpt@db6b7d3ad1da9bf7952788639d967fd05f89b552
Browse files Browse the repository at this point in the history 
Using wpt-import in Chromium c766f32.
With Chromium commits locally applied on WPT:
621cc4e "Rename QueryOptions.select to QueryOptions.postscriptNames, and update the empty list for postscriptNames match no fonts, instead of matching all fonts."


Note to sheriffs: This CL imports external tests and adds
expectations for those tests; if this CL is large and causes
a few new failures, please fix the failures by adding new
lines to TestExpectations rather than reverting. See:
https://chromium.googlesource.com/chromium/src/+/main/docs/testing/web_platform_tests.md

Directory owners for changes in this CL:
igrigorik@chromium.org, yoavweiss@chromium.org:
  external/wpt/preload
ksakamoto@chromium.org, npm@chromium.org, yoavweiss@chromium.org:
  external/wpt/resource-timing

NOAUTOREVERT=true
R=rubber-stamper@appspot.gserviceaccount.com

No-Export: true
Cq-Include-Trybots: luci.chromium.try:linux-wpt-identity-fyi-rel,linux-wpt-input-fyi-rel,linux-blink-rel
Change-Id: I8e7cb8b24ba3779494ac92afedf48ccebbe0b641
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3557396
Auto-Submit: WPT Autoroller <wpt-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#986709}
  • Loading branch information
Chromium WPT Sync authored and Chromium LUCI CQ committed Mar 29, 2022
1 parent 741ed96 commit 2660015
Show file tree
Hide file tree
Showing 9 changed files with 350 additions and 19 deletions.
2 changes: 1 addition & 1 deletion third_party/blink/web_tests/external/Version
View file
@@ -1 +1 @@
Version: cc4c71edb4f3216fc4fc8ca2b589c8cc8bad5d29
Version: db6b7d3ad1da9bf7952788639d967fd05f89b552
197 changes: 185 additions & 12 deletions third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
View file
Expand Up @@ -80740,6 +80740,58 @@
{}
]
],
"multi-line-column-flex-fragmentation-041.html": [
"e81a37429d8160c1c792d039a4c578eb1a3f7053",
[
null,
[
[
"/css/css-break/flexbox/multi-line-column-flex-fragmentation-041-ref.html",
"=="
]
],
{}
]
],
"multi-line-column-flex-fragmentation-042.html": [
"90c93834e2e68b031e8aaba40f8696d69c4ab4cf",
[
null,
[
[
"/css/css-break/flexbox/multi-line-column-flex-fragmentation-042-ref.html",
"=="
]
],
{}
]
],
"multi-line-column-flex-fragmentation-043.html": [
"37b306913686f210a800756541e4c1494b1be484",
[
null,
[
[
"/css/css-break/flexbox/multi-line-column-flex-fragmentation-043-ref.html",
"=="
]
],
{}
]
],
"multi-line-column-flex-fragmentation-044.html": [
"676cb28c818ee552f16f96efb60a9155695737c5",
[
null,
[
[
"/css/css-break/flexbox/multi-line-column-flex-fragmentation-044-ref.html",
"=="
]
],
{}
]
],
"multi-line-column-flex-fragmentation-045.html": [
"b445a15113ca3aa74036a95a6e6e49bed2ca95fa",
[
Expand Down Expand Up @@ -81351,6 +81403,58 @@
{}
]
],
"multi-line-row-flex-fragmentation-047.html": [
"f5947287853b5f312ee0c9aaf056c0c20147e4f0",
[
null,
[
[
"/css/css-break/flexbox/multi-line-row-flex-fragmentation-047-ref.html",
"=="
]
],
{}
]
],
"multi-line-row-flex-fragmentation-048.html": [
"5c32606312d3de0c528f28a31586a737c69e281f",
[
null,
[
[
"/css/css-break/flexbox/multi-line-row-flex-fragmentation-048-ref.html",
"=="
]
],
{}
]
],
"multi-line-row-flex-fragmentation-049.html": [
"e36c48c1594333351ac0a66548ff2aa2520ab8bf",
[
null,
[
[
"/css/css-break/flexbox/multi-line-row-flex-fragmentation-049-ref.html",
"=="
]
],
{}
]
],
"multi-line-row-flex-fragmentation-050.html": [
"a96268df0f11b3c1ab9b48806ad9e4702250cb15",
[
null,
[
[
"/css/css-break/flexbox/multi-line-row-flex-fragmentation-050-ref.html",
"=="
]
],
{}
]
],
"multi-line-row-flex-fragmentation-051.html": [
"0f826cf3c588ef0f7ab3505d149693314457b332",
[
Expand Down Expand Up @@ -81871,6 +81975,19 @@
{}
]
],
"single-line-column-flex-fragmentation-040.html": [
"bc4fa7b01cbbef0f1b6b922c8289b5f5469f9dd5",
[
null,
[
[
"/css/css-break/flexbox/single-line-column-flex-fragmentation-040-ref.html",
"=="
]
],
{}
]
],
"single-line-column-flex-fragmentation-041.html": [
"66a6b0660f4ed8f49e0dbbaa080ba5c65305a071",
[
Expand Down Expand Up @@ -82248,6 +82365,19 @@
{}
]
],
"single-line-row-flex-fragmentation-027.html": [
"85550f18a4a2306749a21a4325269ae639481cbf",
[
null,
[
[
"/css/css-break/flexbox/single-line-row-flex-fragmentation-027-ref.html",
"=="
]
],
{}
]
],
"single-line-row-flex-fragmentation-028.html": [
"4d0b5e52cd38e3d2a91cd9a3c865a4dc64d4556c",
[
Expand Down Expand Up @@ -248593,6 +248723,46 @@
"flex-fragmented-with-float-descendant-001-ref.html": [
"ead53ad704a08d06a2e88ed5e43b9bcaf55aa584",
[]
],
"multi-line-column-flex-fragmentation-041-ref.html": [
"4924a792b73fe47bd463e8d5fd94c073fd586726",
[]
],
"multi-line-column-flex-fragmentation-042-ref.html": [
"ad7d3c78ecb70ea4b115b17ea5e0734eb0b1486a",
[]
],
"multi-line-column-flex-fragmentation-043-ref.html": [
"f6f933a9c5418c06d2d202b9d490075acc878b6a",
[]
],
"multi-line-column-flex-fragmentation-044-ref.html": [
"20710e8c292e4783b12404174b7de7c40edd6d97",
[]
],
"multi-line-row-flex-fragmentation-047-ref.html": [
"d669603858d938bd4b70d394188f3f3cca6e82ea",
[]
],
"multi-line-row-flex-fragmentation-048-ref.html": [
"1ffc07387d4015ae5df7b33b4df08a0178b9d367",
[]
],
"multi-line-row-flex-fragmentation-049-ref.html": [
"ffbedaada1ebe6a3ba2156a0f35615dbf75ec6ea",
[]
],
"multi-line-row-flex-fragmentation-050-ref.html": [
"d0e574022b50c800263bb5a9cb16ddaad13dbfc5",
[]
],
"single-line-column-flex-fragmentation-040-ref.html": [
"3d20cb44e49b065fdb90d400fba69aca442f0fc2",
[]
],
"single-line-row-flex-fragmentation-027-ref.html": [
"e1079de13fb771854107b4022054945a0b460e18",
[]
]
},
"floats-and-text-narrow-and-short-dynamic-ref.html": [
Expand Down Expand Up @@ -314171,7 +314341,7 @@
]
},
"subresource-integrity-expected.txt": [
"fc8970bae9b42146cd19fb0ea36cb3f832e9bdd7",
"114827663a61a4412a4f07879cd9ae24358005b3",
[]
]
},
Expand Down Expand Up @@ -316490,7 +316660,7 @@
[]
],
"fake-hid.js": [
"89318b57a990345cd128677f1ee3cd0161463526",
"70a01490d877b437e2129638ee992f53ba203bc1",
[]
],
"fake-serial.js": [
Expand Down Expand Up @@ -318355,10 +318525,6 @@
"e6e6986dc00a2077b683c28c4b9d639ef0f2d949",
[]
],
"fetch-canvas-tainting-video-with-range-request.https-expected.txt": [
"eb2733136fe9f8fbdb385fff6da47c50a73f9148",
[]
],
"fetch-error.https-expected.txt": [
"783c5dde72314a86961add81b8b37e8009f1f1b4",
[]
Expand Down Expand Up @@ -425238,7 +425404,7 @@
]
],
"font_access_query_select.tentative.https.window.js": [
"b00a96f9a2ad5d298921bd3904acdb42fbd4828e",
"61668ea129385689961af6468fb02ed7ea2a104b",
[
"font-access/font_access_query_select.tentative.https.window.html",
{
Expand Down Expand Up @@ -475550,7 +475716,7 @@
]
],
"pointermove-becomes-drag.html": [
"0f42be0a47499481af1f459aba51175cd39e9290",
"4bccf70423825cbdb01403f175cd02fa4e187702",
[
null,
{
Expand Down Expand Up @@ -488107,14 +488273,14 @@
]
],
"constructor.https.html": [
"e8df7b35a94280a6c71d7d8ac6f1452904535df2",
"3de0469e9c4b9cb30a864e44aca479d1e0e4099c",
[
null,
{}
]
],
"updatewith-method.https.html": [
"c1b47d1d93b5bcc12f34263c60a7daf5c0a131ef",
"9a60fe7a4c0a6090f829f934331ef692429fd4e3",
[
null,
{}
Expand Down Expand Up @@ -491516,7 +491682,7 @@
]
],
"subresource-integrity.html": [
"a1c867e2911cba6d5acea84f6059f73cdc500c74",
"f4ff950924e300cf20f32ab77517a47a8292f147",
[
null,
{}
Expand Down Expand Up @@ -504600,6 +504766,13 @@
{}
]
],
"iframe-non-html.html": [
"a5df3b034899d1fbbf4281d6aa939df53b05feda",
[
null,
{}
]
],
"iframe-redirect-without-location.html": [
"bae5f3112fe2917b66d5994bdf3bf6e7a86b0376",
[
Expand Down Expand Up @@ -509842,7 +510015,7 @@
]
],
"fetch-canvas-tainting-video-with-range-request.https.html": [
"f1ff7ae59a7deb4117ee4c43bdafb5d3ec73fed7",
"28c3071804767b10a1bfe08ee6bc57855c274bcc",
[
null,
{}
Expand Down
10 changes: 9 additions & 1 deletion third_party/blink/web_tests/external/wpt/preload/subresource-integrity-expected.txt
View file
@@ -1,5 +1,5 @@
This is a testharness.js-based test.
Found 65 tests; 59 PASS, 6 FAIL, 0 TIMEOUT, 0 NOTRUN.
Found 73 tests; 67 PASS, 6 FAIL, 0 TIMEOUT, 0 NOTRUN.
PASS Same-origin script with correct sha256 hash.
PASS Same-origin script with correct sha384 hash.
PASS Same-origin script with correct sha512 hash.
Expand All @@ -23,6 +23,10 @@ PASS Same-origin script with matching digest re-uses preload with matching diges
PASS Same-origin script with non-matching digest does not re-use preload with matching digest.
PASS Same-origin script with matching digest does not re-use preload with non-matching digest.
PASS Same-origin script with non-matching digest does not re-use preload with non-matching digest.
PASS Same-origin script with matching digest does not reuse preload without digest.
PASS [Tentative] Same-origin script with matching digest does not reuse preload with matching but stronger digest.
PASS Same-origin script with matching digest does not reuse preload with matching but weaker digest.
PASS Same-origin script with non-matching digest reuses preload with no digest but fails.
PASS Same-origin style with correct sha256 hash.
PASS Same-origin style with correct sha384 hash.
PASS Same-origin style with correct sha512 hash.
Expand All @@ -46,6 +50,10 @@ PASS Same-origin style with matching digest re-uses preload with matching digest
PASS Same-origin style with non-matching digest does not re-use preload with matching digest.
PASS Same-origin style with matching digest does not re-use preload with non-matching digest.
PASS Same-origin style with non-matching digest does not re-use preload with non-matching digest.
PASS Same-origin style with matching digest does not reuse preload without digest.
PASS [Tentative] Same-origin style with matching digest does not reuse preload with matching but stronger digest.
PASS Same-origin style with matching digest does not reuse preload with matching but weaker digest.
PASS Same-origin style with non-matching digest reuses preload with no digest but fails.
PASS Same-origin image with correct sha256 hash.
PASS Same-origin image with correct sha384 hash.
PASS Same-origin image with correct sha512 hash.
Expand Down
45 changes: 45 additions & 0 deletions third_party/blink/web_tests/external/wpt/preload/subresource-integrity.html
View file
Expand Up @@ -309,6 +309,51 @@
{integrity: "sha256-deaddeadbeefYHFvsYdWumweeFAw0hJDTFt9seErghA="}
)

SRIPreloadTest(
true,
true,
`Same-origin ${destination} with matching digest does not reuse preload without digest.`,
2,
destination,
same_origin_prefix + destination + ext + `?${token()}`,
{},
{integrity: sha256}
)

// This is an acceptable failure
SRIPreloadTest(
true,
true,
`[Tentative] Same-origin ${destination} with matching digest does not reuse preload with matching but stronger digest.`,
2,
destination,
same_origin_prefix + destination + ext + `?${token()}`,
{integrity: sha384},
{integrity: sha256},
)

SRIPreloadTest(
true,
true,
`Same-origin ${destination} with matching digest does not reuse preload with matching but weaker digest.`,
2,
destination,
same_origin_prefix + destination + ext + `?${token()}`,
{integrity: sha256},
{integrity: sha384},
)

SRIPreloadTest(
true,
false,
`Same-origin ${destination} with non-matching digest reuses preload with no digest but fails.`,
2,
destination,
same_origin_prefix + destination + ext + `?${token()}`,
{},
{integrity: "sha256-sha256-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"},
)

} // if.

} // for-of.
Expand Down

0 comments on commit 2660015

Please sign in to comment.