From b3eb3a19ade16b9a5aeef75399a6a91a07313f49 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sun, 2 Sep 2018 17:30:45 +0200 Subject: [PATCH] test: fix flaky test-worker-message-port-transfer-self Look at the status of the `MessagePort` rather than relying on a timeout. PR-URL: https://github.com/nodejs/node/pull/22658 Reviewed-By: Benjamin Gruenbaum Reviewed-By: Denys Otrishko Reviewed-By: Luigi Pinca Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: James M Snell Reviewed-By: Ruben Bridgewater --- .../test-worker-message-port-transfer-self.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-worker-message-port-transfer-self.js b/test/parallel/test-worker-message-port-transfer-self.js index 1855023cdfa..4fe12c0a88d 100644 --- a/test/parallel/test-worker-message-port-transfer-self.js +++ b/test/parallel/test-worker-message-port-transfer-self.js @@ -3,6 +3,7 @@ const common = require('../common'); const assert = require('assert'); +const util = require('util'); const { MessageChannel } = require('worker_threads'); const { port1, port2 } = new MessageChannel(); @@ -25,9 +26,22 @@ assert.throws(common.mustCall(() => { // The failed transfer should not affect the ports in anyway. port2.onmessage = common.mustCall((message) => { assert.strictEqual(message, 2); + + assert(util.inspect(port1).includes('active: true'), util.inspect(port1)); + assert(util.inspect(port2).includes('active: true'), util.inspect(port2)); + port1.close(); - setTimeout(common.mustNotCall('The communication channel is still open'), - common.platformTimeout(1000)).unref(); + tick(10, () => { + assert(util.inspect(port1).includes('active: false'), util.inspect(port1)); + assert(util.inspect(port2).includes('active: false'), util.inspect(port2)); + }); }); port1.postMessage(2); + +function tick(n, cb) { + if (n > 0) + setImmediate(() => tick(n - 1, cb)); + else + cb(); +}