diff --git a/lib/internal/stream_base_commons.js b/lib/internal/stream_base_commons.js index 2a31221f11d2d6..df26119be0fca4 100644 --- a/lib/internal/stream_base_commons.js +++ b/lib/internal/stream_base_commons.js @@ -233,7 +233,7 @@ function onStreamRead(arrayBuffer) { function setStreamTimeout(msecs, callback) { if (this.destroyed) - return; + return this; this.timeout = msecs; diff --git a/test/parallel/test-net-socket-timeout.js b/test/parallel/test-net-socket-timeout.js index 8b197b44d61281..e01304afe53f01 100644 --- a/test/parallel/test-net-socket-timeout.js +++ b/test/parallel/test-net-socket-timeout.js @@ -70,8 +70,12 @@ for (let i = 0; i < invalidCallbacks.length; i++) { const server = net.Server(); server.listen(0, common.mustCall(() => { const socket = net.createConnection(server.address().port); - socket.setTimeout(1, common.mustCall(() => { - socket.destroy(); - server.close(); - })); + assert.strictEqual( + socket.setTimeout(1, common.mustCall(() => { + socket.destroy(); + assert.strictEqual(socket.setTimeout(1, common.mustNotCall()), socket); + server.close(); + })), + socket + ); }));