summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2018-03-30 06:15:32 -0700
committerRich Trott <rtrott@gmail.com>2018-04-02 12:36:49 -0700
commit4d749e105282604f20e49b311a27c960473cfc2f (patch)
treef8c1779ff1ad9f9dbd30f43b4f340490c9974cb5 /test
parenta9a1f12b4212c0ea81a04bf2eb56efe6f8a4699b (diff)
downloadandroid-node-v8-4d749e105282604f20e49b311a27c960473cfc2f.tar.gz
android-node-v8-4d749e105282604f20e49b311a27c960473cfc2f.tar.bz2
android-node-v8-4d749e105282604f20e49b311a27c960473cfc2f.zip
test: fix flaky test-cluster-send-handle-twice
Use `common.mustCall()` to make sure connection callback runs exactly once. Use `connect` event instead of `setTimeout` to avoid test failing if timer runs before client is connected. Remove `cluster.worker.disconnect()` after `assert.fail()`. It is unreachable code that is unnecessary. PR-URL: https://github.com/nodejs/node/pull/19700 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/parallel/test-cluster-send-handle-twice.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/parallel/test-cluster-send-handle-twice.js b/test/parallel/test-cluster-send-handle-twice.js
index fc0d4a0308..9eb87d826d 100644
--- a/test/parallel/test-cluster-send-handle-twice.js
+++ b/test/parallel/test-cluster-send-handle-twice.js
@@ -40,10 +40,10 @@ if (cluster.isMaster) {
}));
}
} else {
- const server = net.createServer(function(socket) {
+ const server = net.createServer(common.mustCall((socket) => {
process.send('send-handle-1', socket);
process.send('send-handle-2', socket);
- });
+ }));
server.listen(0, function() {
const client = net.connect({
@@ -51,10 +51,9 @@ if (cluster.isMaster) {
port: server.address().port
});
client.on('close', common.mustCall(() => { cluster.worker.disconnect(); }));
- setTimeout(function() { client.end(); }, 50);
+ client.on('connect', () => { client.end(); });
}).on('error', function(e) {
console.error(e);
assert.fail('server.listen failed');
- cluster.worker.disconnect();
});
}