refactor(tests): move worker_threads itests to spec tests (#23648)

14 files changed, 41 insertions, 42 deletions

diff --git a/tests/integration/worker_tests.rs b/tests/integration/worker_tests.rs
index aa1c9656e..d711b034c 100644
--- a/tests/integration/worker_tests.rs
+++ b/tests/integration/worker_tests.rs
@@ -117,36 +117,3 @@ itest!(worker_ids_are_sequential {
   output: "workers/worker_ids_are_sequential.ts.out",
   exit_code: 0,
 });
-
-// Test for https://github.com/denoland/deno/issues/22629
-// Test for https://github.com/denoland/deno/issues/22934
-itest!(node_worker_auto_exits {
-  args: "run --quiet --allow-read workers/node_worker_auto_exits.mjs",
-  output: "workers/node_worker_auto_exits.mjs.out",
-  exit_code: 0,
-});
-
-itest!(node_worker_message_port {
-  args: "run --quiet --allow-read workers/node_worker_message_port.mjs",
-  output: "workers/node_worker_message_port.mjs.out",
-  exit_code: 0,
-});
-
-itest!(node_worker_transfer_port {
-  args: "run --quiet --allow-read workers/node_worker_transfer_port.mjs",
-  output: "workers/node_worker_transfer_port.mjs.out",
-  exit_code: 0,
-});
-
-itest!(node_worker_message_port_unref {
-  args: "run --quiet --allow-env --allow-read workers/node_worker_message_port_unref.mjs",
-  output: "workers/node_worker_message_port_unref.mjs.out",
-  exit_code: 0,
-});
-
-itest!(node_worker_parent_port_unref {
-  envs: vec![("PARENT_PORT".into(), "1".into())],
-  args: "run --quiet --allow-env --allow-read workers/node_worker_message_port_unref.mjs",
-  output: "workers/node_worker_message_port_unref.mjs.out",
-  exit_code: 0,
-});
diff --git a/tests/specs/node/worker_threads/__test__.jsonc b/tests/specs/node/worker_threads/__test__.jsonc
index adcb9a85d..9254d9d37 100644
--- a/tests/specs/node/worker_threads/__test__.jsonc
+++ b/tests/specs/node/worker_threads/__test__.jsonc
@@ -1,8 +1,40 @@
 {
-  "steps": [{
-    "args": "run message_port_removelistener.mjs",
-    "output": "message_port_removelistener.mjs.out",
-    // Note: successful exit asserts that the test passed
-    "exitCode": 0
-  }]
+  "tests": {
+    "auto_exits": {
+      // Test for https://github.com/denoland/deno/issues/22629
+      // Test for https://github.com/denoland/deno/issues/22934
+      "args": "run --quiet --allow-read auto_exits.mjs",
+      "output": "auto_exits.out",
+      "exitCode": 0
+    },
+    "message_port": {
+      "args": "run --allow-env --allow-read message_port.mjs",
+      "output": "message_port.out",
+      "exitCode": 0
+    },
+    "message_port_transfer": {
+      "args": "run --quiet --allow-read message_port_transfer.mjs",
+      "output": "message_port_transfer.out",
+      "exitCode": 0
+    },
+    "message_port_removelistener": {
+      "args": "run message_port_removelistener.mjs",
+      "output": "message_port_removelistener.out",
+      // Note: successful exit asserts that the test passed
+      "exitCode": 0
+    },
+    "message_port_unref": {
+      "args": "run --allow-env --allow-read message_port_unref.mjs",
+      "output": "message_port_unref.out",
+      "exitCode": 0
+    },
+    "parent_port_unref": {
+      "args": "run --allow-env --allow-read message_port_unref.mjs",
+      "envs": {
+        "PARENT_PORT": "1"
+      },
+      "output": "message_port_unref.out",
+      "exitCode": 0
+    }
+  }
 }
diff --git a/tests/testdata/workers/node_worker_auto_exits.mjs b/tests/specs/node/worker_threads/auto_exits.mjs
index e434f59f7..e434f59f7 100644
--- a/tests/testdata/workers/node_worker_auto_exits.mjs
+++ b/tests/specs/node/worker_threads/auto_exits.mjs
diff --git a/tests/testdata/workers/node_worker_auto_exits.mjs.out b/tests/specs/node/worker_threads/auto_exits.out
index a160931db..a160931db 100644
--- a/tests/testdata/workers/node_worker_auto_exits.mjs.out
+++ b/tests/specs/node/worker_threads/auto_exits.out
diff --git a/tests/testdata/workers/node_worker_message_port.mjs b/tests/specs/node/worker_threads/message_port.mjs
index 91c7e062d..f6503b78d 100644
--- a/tests/testdata/workers/node_worker_message_port.mjs
+++ b/tests/specs/node/worker_threads/message_port.mjs
@@ -7,7 +7,7 @@ const { port1: mainPort, port2: workerPort } = new workerThreads
 const deferred = createDeferred();
 
 const worker = new workerThreads.Worker(
-  import.meta.resolve("./node_worker_message_port_1.cjs"),
+  import.meta.resolve("./message_port_1.cjs"),
   {
     workerData: workerPort,
     transferList: [workerPort],
diff --git a/tests/testdata/workers/node_worker_message_port.mjs.out b/tests/specs/node/worker_threads/message_port.out
index 95b4fbc96..95b4fbc96 100644
--- a/tests/testdata/workers/node_worker_message_port.mjs.out
+++ b/tests/specs/node/worker_threads/message_port.out
diff --git a/tests/testdata/workers/node_worker_message_port_1.cjs b/tests/specs/node/worker_threads/message_port_1.cjs
index 3f78cd539..3f78cd539 100644
--- a/tests/testdata/workers/node_worker_message_port_1.cjs
+++ b/tests/specs/node/worker_threads/message_port_1.cjs
diff --git a/tests/specs/node/worker_threads/message_port_removelistener.mjs.out b/tests/specs/node/worker_threads/message_port_removelistener.out
index 980a0d5f1..980a0d5f1 100644
--- a/tests/specs/node/worker_threads/message_port_removelistener.mjs.out
+++ b/tests/specs/node/worker_threads/message_port_removelistener.out
diff --git a/tests/testdata/workers/node_worker_transfer_port.mjs b/tests/specs/node/worker_threads/message_port_transfer.mjs
index 1b17ed1ab..733a91c86 100644
--- a/tests/testdata/workers/node_worker_transfer_port.mjs
+++ b/tests/specs/node/worker_threads/message_port_transfer.mjs
@@ -2,7 +2,7 @@ import { MessageChannel, Worker } from "node:worker_threads";
 
 const { port1, port2 } = new MessageChannel();
 const worker = new Worker(
-  import.meta.resolve("./node_worker_transfer_port_1.mjs"),
+  import.meta.resolve("./message_port_transfer1.mjs"),
 );
 // Send the port directly after the worker is created
 worker.postMessage(port2, [port2]);
diff --git a/tests/testdata/workers/node_worker_transfer_port.mjs.out b/tests/specs/node/worker_threads/message_port_transfer.out
index 8e8f11940..8e8f11940 100644
--- a/tests/testdata/workers/node_worker_transfer_port.mjs.out
+++ b/tests/specs/node/worker_threads/message_port_transfer.out
diff --git a/tests/testdata/workers/node_worker_transfer_port_1.mjs b/tests/specs/node/worker_threads/message_port_transfer1.mjs
index 4d0a38bd5..4d0a38bd5 100644
--- a/tests/testdata/workers/node_worker_transfer_port_1.mjs
+++ b/tests/specs/node/worker_threads/message_port_transfer1.mjs
diff --git a/tests/testdata/workers/node_worker_message_port_unref.mjs b/tests/specs/node/worker_threads/message_port_unref.mjs
index a12be1ec8..a12be1ec8 100644
--- a/tests/testdata/workers/node_worker_message_port_unref.mjs
+++ b/tests/specs/node/worker_threads/message_port_unref.mjs
diff --git a/tests/testdata/workers/node_worker_message_port_unref.mjs.out b/tests/specs/node/worker_threads/message_port_unref.out
index c9d5325bc..c9d5325bc 100644
--- a/tests/testdata/workers/node_worker_message_port_unref.mjs.out
+++ b/tests/specs/node/worker_threads/message_port_unref.out
diff --git a/tools/lint.js b/tools/lint.js
index ba36d2a72..38077273c 100755
--- a/tools/lint.js
+++ b/tools/lint.js
@@ -221,7 +221,7 @@ async function ensureNoNewITests() {
     "upgrade_tests.rs": 0,
     "vendor_tests.rs": 1,
     "watcher_tests.rs": 0,
-    "worker_tests.rs": 23,
+    "worker_tests.rs": 18,
   };
   const integrationDir = join(ROOT_PATH, "tests", "integration");
   for await (const entry of Deno.readDir(integrationDir)) {