Skip to content

Commit 1860eae

Browse files
Trottrvagg
authored andcommitted
test: refactor test-net-settimeout
test-net-settimeout is unnecessarily complex. This change simplifies it. PR-URL: #4799 Reviewed-By: Brian White <[email protected]> Reviewed-By: Johan Bergström <[email protected]>
1 parent fa0457e commit 1860eae

File tree

1 file changed

+15
-23
lines changed

1 file changed

+15
-23
lines changed

test/parallel/test-net-settimeout.js

+15-23
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,28 @@
22
// This example sets a timeout then immediately attempts to disable the timeout
33
// https://github.com/joyent/node/pull/2245
44

5-
var common = require('../common');
6-
var net = require('net');
7-
var assert = require('assert');
5+
const common = require('../common');
6+
const net = require('net');
7+
const assert = require('assert');
88

9-
var T = 100;
9+
const T = 100;
1010

11-
var server = net.createServer(function(c) {
11+
const server = net.createServer(function(c) {
1212
c.write('hello');
1313
});
1414
server.listen(common.PORT);
1515

16-
var killers = [0];
16+
const socket = net.createConnection(common.PORT, 'localhost');
1717

18-
var left = killers.length;
19-
killers.forEach(function(killer) {
20-
var socket = net.createConnection(common.PORT, 'localhost');
18+
const s = socket.setTimeout(T, function() {
19+
common.fail('Socket timeout event is not expected to fire');
20+
});
21+
assert.ok(s instanceof net.Socket);
2122

22-
var s = socket.setTimeout(T, function() {
23-
socket.destroy();
24-
if (--left === 0) server.close();
25-
assert.ok(killer !== 0);
26-
clearTimeout(timeout);
27-
});
28-
assert.ok(s instanceof net.Socket);
23+
socket.setTimeout(0);
2924

30-
socket.setTimeout(killer);
25+
setTimeout(function() {
26+
socket.destroy();
27+
server.close();
28+
}, T * 2);
3129

32-
var timeout = setTimeout(function() {
33-
socket.destroy();
34-
if (--left === 0) server.close();
35-
assert.ok(killer === 0);
36-
}, T * 2);
37-
});

0 commit comments

Comments
 (0)