summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2018-07-13 15:07:23 +0200
committerAnna Henningsen <anna@addaleax.net>2018-07-13 19:22:13 +0200
commit36cc5f5caf52af895079d153a9131fe2b0c6b8f9 (patch)
treefa282c9864cdf1ed9c700c0705ebe5409f633643 /test
parent32cad739b12c3f1b24dff9a24e8321927e9b2eb2 (diff)
downloadandroid-node-v8-36cc5f5caf52af895079d153a9131fe2b0c6b8f9.tar.gz
android-node-v8-36cc5f5caf52af895079d153a9131fe2b0c6b8f9.tar.bz2
android-node-v8-36cc5f5caf52af895079d153a9131fe2b0c6b8f9.zip
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 <me@jonathanmoss.me> Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/parallel/test-worker-exit-code.js6
-rw-r--r--test/parallel/test-worker-onmessage.js6
2 files changed, 8 insertions, 4 deletions
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);