From abdb6aad6e3e9aa8b6943eba1bbe297f34a825f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Tue, 27 Sep 2022 23:32:17 +0200 Subject: [PATCH] chore(wpt): add ability to ignore a test file (#16056) --- tools/wpt.ts | 10 ++++++ tools/wpt/expectation.json | 72 ++++---------------------------------- 2 files changed, 16 insertions(+), 66 deletions(-) diff --git a/tools/wpt.ts b/tools/wpt.ts index ad30b95b45..b1067655cd 100755 --- a/tools/wpt.ts +++ b/tools/wpt.ts @@ -679,6 +679,16 @@ function discoverTestsToRun( if (expectation === undefined) continue; + if (typeof expectation === "object") { + if (typeof expectation.ignore !== "undefined") { + assert( + typeof expectation.ignore === "boolean", + "test entry's `ignore` key must be a boolean", + ); + if (expectation.ignore === true) continue; + } + } + assert( Array.isArray(expectation) || typeof expectation == "boolean", "test entry must not have a folder expectation", diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json index 8bab051595..b5df6cacf1 100644 --- a/tools/wpt/expectation.json +++ b/tools/wpt/expectation.json @@ -1099,71 +1099,9 @@ ] }, "wrapKey_unwrapKey": { - "wrapKey_unwrapKey.https.any.worker.html": [ - "Can wrap and unwrap ECDH public key keys using spki and AES-CTR", - "Can wrap and unwrap ECDH public key keys using spki and AES-CBC", - "Can wrap and unwrap ECDSA public key keys using spki and AES-GCM", - "Can wrap and unwrap ECDSA public key keys using jwk and AES-GCM", - "Can wrap and unwrap ECDSA private key keys using pkcs8 and AES-GCM", - "Can wrap and unwrap ECDSA private key keys as non-extractable using pkcs8 and AES-GCM", - "Can wrap and unwrap ECDSA private key keys using jwk and AES-GCM", - "Can wrap and unwrap ECDSA private key keys as non-extractable using jwk and AES-GCM", - "Can unwrap ECDSA private key non-extractable keys using jwk and AES-GCM", - "Can wrap and unwrap ECDH public key keys using spki and AES-GCM", - "Can wrap and unwrap ECDH public key keys using jwk and AES-GCM", - "Can wrap and unwrap ECDH private key keys using pkcs8 and AES-GCM", - "Can wrap and unwrap ECDH private key keys as non-extractable using pkcs8 and AES-GCM", - "Can wrap and unwrap ECDH private key keys using jwk and AES-GCM", - "Can wrap and unwrap ECDH private key keys as non-extractable using jwk and AES-GCM", - "Can unwrap ECDH private key non-extractable keys using jwk and AES-GCM", - "Can wrap and unwrap HMAC keys using raw and AES-GCM", - "Can wrap and unwrap HMAC keys as non-extractable using raw and AES-GCM", - "Can wrap and unwrap HMAC keys using jwk and AES-GCM", - "Can wrap and unwrap HMAC keys as non-extractable using jwk and AES-GCM", - "Can unwrap HMAC non-extractable keys using jwk and AES-GCM", - "Can wrap and unwrap AES-CTR keys using raw and AES-GCM", - "Can wrap and unwrap AES-CTR keys as non-extractable using raw and AES-GCM", - "Can wrap and unwrap AES-CTR keys using jwk and AES-GCM", - "Can wrap and unwrap AES-CTR keys as non-extractable using jwk and AES-GCM", - "Can unwrap AES-CTR non-extractable keys using jwk and AES-GCM", - "Can wrap and unwrap AES-CBC keys using raw and AES-GCM", - "Can wrap and unwrap AES-CBC keys as non-extractable using raw and AES-GCM", - "Can wrap and unwrap AES-CBC keys using jwk and AES-GCM", - "Can wrap and unwrap AES-CBC keys as non-extractable using jwk and AES-GCM", - "Can unwrap AES-CBC non-extractable keys using jwk and AES-GCM", - "Can wrap and unwrap AES-GCM keys using raw and AES-GCM", - "Can wrap and unwrap AES-GCM keys as non-extractable using raw and AES-GCM", - "Can wrap and unwrap AES-GCM keys using jwk and AES-GCM", - "Can wrap and unwrap AES-GCM keys as non-extractable using jwk and AES-GCM", - "Can unwrap AES-GCM non-extractable keys using jwk and AES-GCM", - "Can wrap and unwrap AES-KW keys using raw and AES-GCM", - "Can wrap and unwrap AES-KW keys as non-extractable using raw and AES-GCM", - "Can wrap and unwrap AES-KW keys using jwk and AES-GCM", - "Can wrap and unwrap AES-KW keys as non-extractable using jwk and AES-GCM", - "Can unwrap AES-KW non-extractable keys using jwk and AES-GCM", - "Can wrap and unwrap RSASSA-PKCS1-v1_5 public key keys using spki and AES-GCM", - "Can wrap and unwrap RSASSA-PKCS1-v1_5 public key keys using jwk and AES-GCM", - "Can wrap and unwrap RSASSA-PKCS1-v1_5 private key keys using pkcs8 and AES-GCM", - "Can wrap and unwrap RSASSA-PKCS1-v1_5 private key keys as non-extractable using pkcs8 and AES-GCM", - "Can wrap and unwrap RSASSA-PKCS1-v1_5 private key keys using jwk and AES-GCM", - "Can wrap and unwrap RSASSA-PKCS1-v1_5 private key keys as non-extractable using jwk and AES-GCM", - "Can unwrap RSASSA-PKCS1-v1_5 private key non-extractable keys using jwk and AES-GCM", - "Can wrap and unwrap RSA-OAEP public key keys using spki and AES-GCM", - "Can wrap and unwrap RSA-OAEP public key keys using jwk and AES-GCM", - "Can wrap and unwrap RSA-OAEP private key keys using pkcs8 and AES-GCM", - "Can wrap and unwrap RSA-OAEP private key keys as non-extractable using pkcs8 and AES-GCM", - "Can wrap and unwrap RSA-OAEP private key keys using jwk and AES-GCM", - "Can wrap and unwrap RSA-OAEP private key keys as non-extractable using jwk and AES-GCM", - "Can unwrap RSA-OAEP private key non-extractable keys using jwk and AES-GCM", - "Can wrap and unwrap RSA-PSS public key keys using spki and AES-GCM", - "Can wrap and unwrap RSA-PSS public key keys using jwk and AES-GCM", - "Can wrap and unwrap RSA-PSS private key keys using pkcs8 and AES-GCM", - "Can wrap and unwrap RSA-PSS private key keys as non-extractable using pkcs8 and AES-GCM", - "Can wrap and unwrap RSA-PSS private key keys using jwk and AES-GCM", - "Can wrap and unwrap RSA-PSS private key keys as non-extractable using jwk and AES-GCM", - "Can unwrap RSA-PSS private key non-extractable keys using jwk and AES-GCM", - "Can wrap and unwrap ECDH public key keys using spki and RSA-OAEP" - ], + "wrapKey_unwrapKey.https.any.worker.html": { + "ignore": true + }, "wrapKey_unwrapKey.https.any.html": [ "Can wrap and unwrap ECDH public key keys using spki and AES-CTR", "Can wrap and unwrap ECDH public key keys using spki and AES-CBC", @@ -3132,7 +3070,9 @@ "Fetch with POST with ReadableStream containing Blob", "Fetch with POST with text body on 421 response should be retried once on new connection." ], - "response-null-body.any.worker.html": true, + "response-null-body.any.worker.html": { + "ignore": true + }, "response-url.sub.any.html": true, "response-url.sub.any.worker.html": true, "scheme-about.any.html": true,