From 36cc5f5caf52af895079d153a9131fe2b0c6b8f9 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 13 Jul 2018 15:07:23 +0200 Subject: test: fix timeouts when running worker tests with `--worker` These tests have been added after the original workers PR and time out when run inside a worker by themselves. This is needed for enabling `--worker` tests in our regular CI. Refs: https://github.com/nodejs/build/issues/1318 PR-URL: https://github.com/nodejs/node/pull/21791 Reviewed-By: Jon Moss Reviewed-By: Refael Ackermann --- test/parallel/test-worker-exit-code.js | 6 ++++-- test/parallel/test-worker-onmessage.js | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/parallel/test-worker-exit-code.js b/test/parallel/test-worker-exit-code.js index bb47e1cece..b621389b49 100644 --- a/test/parallel/test-worker-exit-code.js +++ b/test/parallel/test-worker-exit-code.js @@ -7,9 +7,11 @@ const common = require('../common'); const assert = require('assert'); const worker = require('worker_threads'); -const { Worker, isMainThread, parentPort } = worker; +const { Worker, parentPort } = worker; -if (isMainThread) { +// Do not use isMainThread so that this test itself can be run inside a Worker. +if (!process.env.HAS_STARTED_WORKER) { + process.env.HAS_STARTED_WORKER = 1; parent(); } else { if (!parentPort) { diff --git a/test/parallel/test-worker-onmessage.js b/test/parallel/test-worker-onmessage.js index 895536c150..2ae3d90f85 100644 --- a/test/parallel/test-worker-onmessage.js +++ b/test/parallel/test-worker-onmessage.js @@ -2,9 +2,11 @@ 'use strict'; const common = require('../common'); const assert = require('assert'); -const { Worker, isMainThread, parentPort } = require('worker_threads'); +const { Worker, parentPort } = require('worker_threads'); -if (isMainThread) { +// Do not use isMainThread so that this test itself can be run inside a Worker. +if (!process.env.HAS_STARTED_WORKER) { + process.env.HAS_STARTED_WORKER = 1; const w = new Worker(__filename); w.on('message', common.mustCall((message) => { assert.strictEqual(message, 4); -- cgit v1.2.3