summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoshiya Hinosawa <stibium121@gmail.com>2023-04-18 00:36:49 +0900
committerGitHub <noreply@github.com>2023-04-18 00:36:49 +0900
commit559a61b879366c01fbbc078c03743cd836189ae7 (patch)
treea87d42f63c26eb7c91f2f4ef3edbec98aeb38c82
parentbcbdaac7e6399870b5b6fcdf765013c1682fe80c (diff)
chore: update node compat config (#18736)
-rw-r--r--cli/tests/node_compat/config.json6
-rw-r--r--cli/tests/node_compat/test/fixtures/keys/agent1-cert.pem7
-rw-r--r--cli/tests/node_compat/test/fixtures/keys/agent1-key.pem7
-rw-r--r--cli/tests/node_compat/test/fixtures/keys/ca1-cert.pem2
-rw-r--r--cli/tests/node_compat/test/parallel/test-crypto-secret-keygen.js9
-rw-r--r--tools/node_compat/TODO.md8
-rwxr-xr-xtools/node_compat/setup.ts10
7 files changed, 24 insertions, 25 deletions
diff --git a/cli/tests/node_compat/config.json b/cli/tests/node_compat/config.json
index 5ee86a03c..60d5beb34 100644
--- a/cli/tests/node_compat/config.json
+++ b/cli/tests/node_compat/config.json
@@ -43,7 +43,10 @@
"test-child-process-stdout-flush-exit.js",
"test-child-process-stdout-flush.js",
"test-console-instance.js",
+ "test-crypto-hkdf.js",
"test-crypto-hmac.js",
+ "test-crypto-prime.js",
+ "test-crypto-x509.js",
"test-dgram-custom-lookup.js",
"test-dgram-ipv6only.js",
"test-dgram-send-cb-quelches-error.js",
@@ -131,7 +134,8 @@
],
"fixtures/keys": [
"agent1-cert.pem",
- "agent1-key.pem"
+ "agent1-key.pem",
+ "ca1-cert.pem"
],
"internet": [
"test-dns-any.js",
diff --git a/cli/tests/node_compat/test/fixtures/keys/agent1-cert.pem b/cli/tests/node_compat/test/fixtures/keys/agent1-cert.pem
index 938ec42b7..bef645b0f 100644
--- a/cli/tests/node_compat/test/fixtures/keys/agent1-cert.pem
+++ b/cli/tests/node_compat/test/fixtures/keys/agent1-cert.pem
@@ -1,10 +1,3 @@
-// deno-fmt-ignore-file
-// deno-lint-ignore-file
-
-// Copyright Joyent and Node contributors. All rights reserved. MIT license.
-// Taken from Node 18.12.1
-// This file is automatically generated by "node/_tools/setup.ts". Do not modify this file manually
-
-----BEGIN CERTIFICATE-----
MIID6DCCAtCgAwIBAgIUFH02wcL3Qgben6tfIibXitsApCYwDQYJKoZIhvcNAQEL
BQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEPMA0G
diff --git a/cli/tests/node_compat/test/fixtures/keys/agent1-key.pem b/cli/tests/node_compat/test/fixtures/keys/agent1-key.pem
index b182ac5ed..1bd840716 100644
--- a/cli/tests/node_compat/test/fixtures/keys/agent1-key.pem
+++ b/cli/tests/node_compat/test/fixtures/keys/agent1-key.pem
@@ -1,10 +1,3 @@
-// deno-fmt-ignore-file
-// deno-lint-ignore-file
-
-// Copyright Joyent and Node contributors. All rights reserved. MIT license.
-// Taken from Node 18.12.1
-// This file is automatically generated by "node/_tools/setup.ts". Do not modify this file manually
-
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEA1FYyCvsg04Jwk9wsQoTtBN+6vVbh3a5Snii3kM1CVtsnM0nz
c1/9M3x6Y2Psylont/c9xwialsbYhtsMYjiPHN1qljr81ZnVgA5YehH5CJYPhO1Q
diff --git a/cli/tests/node_compat/test/fixtures/keys/ca1-cert.pem b/cli/tests/node_compat/test/fixtures/keys/ca1-cert.pem
index 4ba203b58..e1a012c6b 100644
--- a/cli/tests/node_compat/test/fixtures/keys/ca1-cert.pem
+++ b/cli/tests/node_compat/test/fixtures/keys/ca1-cert.pem
@@ -19,4 +19,4 @@ F7KvAZpYYKN9EMH1S/267By6H2I33BT/Ethv//n8dSfmuCurR1kYRaiOC4PVeyFk
B3sj8TtolrN0y/nToWUhmKiaVFnDx3odQ00yhmxR3t21iB7yDkko6D8Vf2dVC4j/
YYBVprXGlTP/hiYRLDoP20xKOYznx5cvHPJ9p+lVcOZUJsJj/Iy750+2n5UiBmXt
lz88C25ucKA=
------END CERTIFICATE----- \ No newline at end of file
+-----END CERTIFICATE-----
diff --git a/cli/tests/node_compat/test/parallel/test-crypto-secret-keygen.js b/cli/tests/node_compat/test/parallel/test-crypto-secret-keygen.js
index 098882215..a9db29806 100644
--- a/cli/tests/node_compat/test/parallel/test-crypto-secret-keygen.js
+++ b/cli/tests/node_compat/test/parallel/test-crypto-secret-keygen.js
@@ -1,3 +1,10 @@
+// deno-fmt-ignore-file
+// deno-lint-ignore-file
+
+// Copyright Joyent and Node contributors. All rights reserved. MIT license.
+// Taken from Node 18.12.1
+// This file is automatically generated by "node/_tools/setup.ts". Do not modify this file manually
+
'use strict';
const common = require('../common');
if (!common.hasCrypto)
@@ -134,4 +141,4 @@ assert.throws(
assert.throws(() => generateKeySync('unknown', { length: 123 }), {
code: 'ERR_INVALID_ARG_VALUE',
message: /The argument 'type' must be a supported key type/
-}); \ No newline at end of file
+});
diff --git a/tools/node_compat/TODO.md b/tools/node_compat/TODO.md
index 42e36cc9b..2b6338bdc 100644
--- a/tools/node_compat/TODO.md
+++ b/tools/node_compat/TODO.md
@@ -482,7 +482,6 @@ Total: 2924
- [parallel/test-crypto-getcipherinfo.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-getcipherinfo.js)
- [parallel/test-crypto-hash-stream-pipe.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-hash-stream-pipe.js)
- [parallel/test-crypto-hash.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-hash.js)
-- [parallel/test-crypto-hkdf.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-hkdf.js)
- [parallel/test-crypto-key-objects-messageport.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-key-objects-messageport.js)
- [parallel/test-crypto-key-objects.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-key-objects.js)
- [parallel/test-crypto-keygen-deprecation.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-keygen-deprecation.js)
@@ -493,7 +492,6 @@ Total: 2924
- [parallel/test-crypto-padding-aes256.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-padding-aes256.js)
- [parallel/test-crypto-padding.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-padding.js)
- [parallel/test-crypto-pbkdf2.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-pbkdf2.js)
-- [parallel/test-crypto-prime.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-prime.js)
- [parallel/test-crypto-private-decrypt-gh32240.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-private-decrypt-gh32240.js)
- [parallel/test-crypto-psychic-signatures.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-psychic-signatures.js)
- [parallel/test-crypto-random.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-random.js)
@@ -501,7 +499,6 @@ Total: 2924
- [parallel/test-crypto-randomuuid.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-randomuuid.js)
- [parallel/test-crypto-rsa-dsa.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-rsa-dsa.js)
- [parallel/test-crypto-scrypt.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-scrypt.js)
-- [parallel/test-crypto-secret-keygen.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-secret-keygen.js)
- [parallel/test-crypto-secure-heap.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-secure-heap.js)
- [parallel/test-crypto-sign-verify.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-sign-verify.js)
- [parallel/test-crypto-stream.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-stream.js)
@@ -510,7 +507,6 @@ Total: 2924
- [parallel/test-crypto-verify-failure.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-verify-failure.js)
- [parallel/test-crypto-webcrypto-aes-decrypt-tag-too-small.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-webcrypto-aes-decrypt-tag-too-small.js)
- [parallel/test-crypto-worker-thread.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-worker-thread.js)
-- [parallel/test-crypto-x509.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-x509.js)
- [parallel/test-crypto.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto.js)
- [parallel/test-cwd-enoent-preload.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cwd-enoent-preload.js)
- [parallel/test-cwd-enoent-repl.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cwd-enoent-repl.js)
@@ -1222,9 +1218,13 @@ Total: 2924
- [parallel/test-http-upgrade-server.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-upgrade-server.js)
- [parallel/test-http-upgrade-server2.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-upgrade-server2.js)
- [parallel/test-http-url.parse-auth-with-header-in-request.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-url.parse-auth-with-header-in-request.js)
+- [parallel/test-http-url.parse-auth.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-url.parse-auth.js)
- [parallel/test-http-url.parse-basic.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-url.parse-basic.js)
- [parallel/test-http-url.parse-https.request.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-url.parse-https.request.js)
- [parallel/test-http-url.parse-only-support-http-https-protocol.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-url.parse-only-support-http-https-protocol.js)
+- [parallel/test-http-url.parse-path.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-url.parse-path.js)
+- [parallel/test-http-url.parse-post.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-url.parse-post.js)
+- [parallel/test-http-url.parse-search.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-url.parse-search.js)
- [parallel/test-http-wget.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-wget.js)
- [parallel/test-http-writable-true-after-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-writable-true-after-close.js)
- [parallel/test-http-write-callbacks.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-write-callbacks.js)
diff --git a/tools/node_compat/setup.ts b/tools/node_compat/setup.ts
index 3cac72019..c8fd6a8e0 100755
--- a/tools/node_compat/setup.ts
+++ b/tools/node_compat/setup.ts
@@ -182,9 +182,10 @@ async function copyTests() {
const srcFile = await Deno.open(
new URL(`${suite}/${entry.name}`, NODE_LOCAL_TEST_URL),
);
- await writeAll(
- destFile,
- encoder.encode(`// deno-fmt-ignore-file
+ if (dest.pathname.endsWith("js")) {
+ await writeAll(
+ destFile,
+ encoder.encode(`// deno-fmt-ignore-file
// deno-lint-ignore-file
// Copyright Joyent and Node contributors. All rights reserved. MIT license.
@@ -192,7 +193,8 @@ async function copyTests() {
// This file is automatically generated by "node/_tools/setup.ts". Do not modify this file manually
`),
- );
+ );
+ }
await srcFile.readable.pipeTo(destFile.writable);
}
}