chore: fix & update node compat config (denoland#19106)

fanbaby · May 13, 2023 · 2a0c664 · 2a0c664
1 parent 68c0fcb
commit 2a0c664
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 41 deletions.
diff --git a/cli/tests/node_compat/config.jsonc b/cli/tests/node_compat/config.jsonc
@@ -366,7 +366,6 @@
  "test-http-outgoing-message-inheritance.js",
  "test-http-outgoing-renderHeaders.js",
  "test-http-outgoing-settimeout.js",
- "test-module-run-main.js",
  "test-net-access-byteswritten.js",
  "test-net-better-error-messages-listen-path.js",
  "test-net-better-error-messages-path.js",
@@ -655,8 +654,6 @@
  "test-whatwg-url-override-hostname.js",
  "test-whatwg-url-properties.js",
  "test-whatwg-url-toascii.js",
- "test-worker-threads-broadcast-channel.js",
- "test-worker-threads-message-channel.js",
  "test-zlib-close-after-error.js",
  "test-zlib-close-after-write.js",
  "test-zlib-convenience-methods.js",

diff --git a/cli/tests/node_compat/test/fixtures/run-main.js b/cli/tests/node_compat/test/fixtures/run-main.js
diff --git a/cli/tests/node_compat/test/parallel/test-module-run-main.js b/cli/tests/node_compat/test/parallel/test-module-run-main.js
diff --git a/cli/tests/node_compat/test/parallel/test-worker-threads-broadcast-channel.js b/cli/tests/node_compat/test/parallel/test-worker-threads-broadcast-channel.js
diff --git a/cli/tests/node_compat/test/parallel/test-worker-threads-message-channel.js b/cli/tests/node_compat/test/parallel/test-worker-threads-message-channel.js
diff --git a/cli/tests/unit_node/module_test.ts b/cli/tests/unit_node/module_test.ts
@@ -1,7 +1,8 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
 import { Module } from "node:module";
-import { assertStrictEquals } from "../../../test_util/std/testing/asserts.ts";
+import { assertEquals } from "../../../test_util/std/testing/asserts.ts";
+import process from "node:process";
 
 Deno.test("[node/module _preloadModules] has internal require hook", () => {
  // Check if it's there
@@ -10,5 +11,17 @@ Deno.test("[node/module _preloadModules] has internal require hook", () => {
  "./cli/tests/unit_node/testdata/add_global_property.js",
  ]);
  // deno-lint-ignore no-explicit-any
- assertStrictEquals((globalThis as any).foo, "Hello");
+ assertEquals((globalThis as any).foo, "Hello");
+});
+
+Deno.test("[node/module runMain] loads module using the current process.argv", () => {
+ process.argv = [
+ process.argv[0],
+ "./cli/tests/unit_node/testdata/add_global_property_run_main.js",
+ ];
+
+ // deno-lint-ignore no-explicit-any
+ (Module as any).runMain();
+ // deno-lint-ignore no-explicit-any
+ assertEquals((globalThis as any).calledViaRunMain, true);
 });
diff --git a/cli/tests/unit_node/testdata/add_global_property_run_main.js b/cli/tests/unit_node/testdata/add_global_property_run_main.js
@@ -0,0 +1 @@
+globalThis.calledViaRunMain = true;
diff --git a/cli/tests/unit_node/worker_threads_test.ts b/cli/tests/unit_node/worker_threads_test.ts
@@ -0,0 +1,13 @@
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+
+import { assertEquals } from "../../../test_util/std/testing/asserts.ts";
+import workerThreads from "node:worker_threads";
+
+Deno.test("[node/worker_threads] BroadcastChannel is exported", () => {
+ assertEquals<unknown>(workerThreads.BroadcastChannel, BroadcastChannel);
+});
+
+Deno.test("[node/worker_threads] MessageChannel are MessagePort are exported", () => {
+ assertEquals<unknown>(workerThreads.MessageChannel, MessageChannel);
+ assertEquals<unknown>(workerThreads.MessagePort, MessagePort);
+});
diff --git a/tools/node_compat/TODO.md b/tools/node_compat/TODO.md
@@ -3,7 +3,7 @@
 
 NOTE: This file should not be manually edited. Please edit 'cli/tests/node_compat/config.json' and run 'tools/node_compat/setup.ts' instead.
 
-Total: 2923
+Total: 2924
 
 - [abort/test-abort-backtrace.js](https://github.com/nodejs/node/tree/v18.12.1/test/abort/test-abort-backtrace.js)
 - [abort/test-abort-fatal-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/abort/test-abort-fatal-error.js)
@@ -281,6 +281,7 @@ Total: 2923
 - [parallel/test-child-process-exec-encoding.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-exec-encoding.js)
 - [parallel/test-child-process-exec-std-encoding.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-exec-std-encoding.js)
 - [parallel/test-child-process-exec-timeout-expire.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-exec-timeout-expire.js)
+- [parallel/test-child-process-exec-timeout-kill.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-exec-timeout-kill.js)
 - [parallel/test-child-process-exec-timeout-not-expired.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-exec-timeout-not-expired.js)
 - [parallel/test-child-process-execFile-promisified-abortController.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-execFile-promisified-abortController.js)
 - [parallel/test-child-process-execfile.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-execfile.js)