Commit f7792de
test: fix flaky test-net-socket-timeout
The setTimeout() call is unneeded. If the socket never times out, then
the test will never finish. Because timers can be unreliable on machines
under load, using setTimeout() here effectively creates a race
condition.
PR-URL: #10172
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>1 parent 3d3263c commit f7792de
1 file changed
Lines changed: 14 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,14 +1,17 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - var common = require('../common'); | ||
| 3 | - var net = require('net'); | ||
| 4 | - var assert = require('assert'); | ||
| 2 | + const common = require('../common'); | ||
| 3 | + const net = require('net'); | ||
| 4 | + const assert = require('assert'); | ||
| 5 | 5 | ||
| 6 | 6 | // Verify that invalid delays throw | |
| 7 | - var noop = function() {}; | ||
| 8 | - var s = new net.Socket(); | ||
| 9 | - var nonNumericDelays = ['100', true, false, undefined, null, '', {}, noop, []]; | ||
| 10 | - var badRangeDelays = [-0.001, -1, -Infinity, Infinity, NaN]; | ||
| 11 | - var validDelays = [0, 0.001, 1, 1e6]; | ||
| 7 | + const noop = function() {}; | ||
| 8 | + const s = new net.Socket(); | ||
| 9 | + const nonNumericDelays = [ | ||
| 10 | + '100', true, false, undefined, null, '', {}, noop, [] | ||
| 11 | + ]; | ||
| 12 | + const badRangeDelays = [-0.001, -1, -Infinity, Infinity, NaN]; | ||
| 13 | + const validDelays = [0, 0.001, 1, 1e6]; | ||
| 14 | + | ||
| 12 | 15 | ||
| 13 | 16 | for (let i = 0; i < nonNumericDelays.length; i++) { | |
| 14 | 17 | assert.throws(function() { | |
@@ -28,15 +31,11 @@ for (let i = 0; i < validDelays.length; i++) { | |||
| 28 | 31 | }); | |
| 29 | 32 | } | |
| 30 | 33 | ||
| 31 | - var server = net.Server(); | ||
| 34 | + const server = net.Server(); | ||
| 32 | 35 | server.listen(0, common.mustCall(function() { | |
| 33 | - var socket = net.createConnection(this.address().port); | ||
| 34 | - socket.setTimeout(100, common.mustCall(function() { | ||
| 36 | + const socket = net.createConnection(this.address().port); | ||
| 37 | + socket.setTimeout(1, common.mustCall(function() { | ||
| 35 | 38 | socket.destroy(); | |
| 36 | 39 | server.close(); | |
| 37 | - clearTimeout(timer); | ||
| 38 | 40 | })); | |
| 39 | - var timer = setTimeout(function() { | ||
| 40 | - process.exit(1); | ||
| 41 | - }, common.platformTimeout(200)); | ||
| 42 | 41 | })); | |
0 commit comments