test: fix net transfer tests in worker mode

Use explicit workerData roles for helper workers so the test file remains the coordinator when run via tools/test.py --worker.

Signed-off-by: Matteo Collina <hello@matteocollina.com>

Author: mcollina

test/parallel/test-net-server-transfer-worker.js

@@ -1,8 +1,8 @@
 'use strict';
 
 // This test verifies that a listening net.Server can be transferred to a worker
-// thread via worker_threads postMessage()'s transferList. The main thread binds
-// and listens, then hands the server off; the worker accepts connections and
+// thread via worker_threads postMessage()'s transferList. The parent thread
+// binds and listens, then hands the server off; the worker accepts connections and
 // responds, proving the listening socket (and its accept queue) moved loops.
 
 const common = require('../common');
@@ -16,12 +16,12 @@ const assert = require('assert');
 const net = require('net');
 const {
   Worker,
-  isMainThread,
   parentPort,
   threadId,
+  workerData,
 } = require('worker_threads');
 
-if (!isMainThread) {
+if (workerData?.role === 'server') {
   parentPort.on('message', common.mustCall(({ server }) => {
     assert.ok(server instanceof net.Server);
     server.on('connection', (socket) => {
@@ -31,7 +31,7 @@ if (!isMainThread) {
   return;
 }
 
-const worker = new Worker(__filename);
+const worker = new Worker(__filename, { workerData: { role: 'server' } });
 
 const server = net.createServer();
 

test/parallel/test-net-socket-transfer-worker-http.js

@@ -1,8 +1,8 @@
 'use strict';
 
 // This test verifies HTTP load balancing on top of transferred TCP sockets:
-// the main thread accepts connections and distributes each one round-robin to a
-// pool of worker threads, where an http.Server handles the request. It exercises
+// the parent thread accepts connections and distributes each one round-robin to
+// a pool of worker threads, where an http.Server handles the request. It exercises
 // the intended use case for transferring net.Socket handles across threads.
 
 const common = require('../common');
@@ -17,17 +17,17 @@ const net = require('net');
 const http = require('http');
 const {
   Worker,
-  isMainThread,
   parentPort,
   threadId,
+  workerData,
 } = require('worker_threads');
 
 const POOL = 4;
 const REQ_PER_WORKER = 5;
 const TOTAL = POOL * REQ_PER_WORKER;
 
-if (!isMainThread) {
-  // Each worker serves HTTP over connections transferred from the main thread.
+if (workerData?.role === 'http-server') {
+  // Each worker serves HTTP over connections transferred from the parent thread.
   const server = http.createServer((req, res) => {
     res.end(`thread:${threadId}`);
   });
@@ -40,7 +40,7 @@ if (!isMainThread) {
 
 const workers = [];
 for (let i = 0; i < POOL; i++)
-  workers.push(new Worker(__filename));
+  workers.push(new Worker(__filename, { workerData: { role: 'http-server' } }));
 
 let next = 0;
 const front = net.createServer((socket) => {

test/parallel/test-net-socket-transfer-worker.js

@@ -2,7 +2,7 @@
 
 // This test verifies that an accepted net.Socket connection can be transferred
 // to a worker thread via worker_threads postMessage()'s transferList, and that
-// the worker can read from and write to it. The main thread accepts the
+// the worker can read from and write to it. The parent thread accepts the
 // connection and hands it off; the worker echoes data back.
 
 const common = require('../common');
@@ -16,11 +16,11 @@ const assert = require('assert');
 const net = require('net');
 const {
   Worker,
-  isMainThread,
   parentPort,
+  workerData,
 } = require('worker_threads');
 
-if (!isMainThread) {
+if (workerData?.role === 'socket') {
   // Worker side: receive the transferred connection and echo everything back.
   parentPort.on('message', common.mustCall(({ socket }) => {
     assert.ok(socket instanceof net.Socket);
@@ -32,7 +32,7 @@ if (!isMainThread) {
   return;
 }
 
-const worker = new Worker(__filename);
+const worker = new Worker(__filename, { workerData: { role: 'socket' } });
 
 const server = net.createServer(common.mustCall((socket) => {
   // Hand the freshly accepted connection off to the worker. It must not be