test: refactor test-net-settimeout

test-net-settimeout is unnecessarily complex. This change simplifies it.

PR-URL: https://github.com/nodejs/node/pull/4799
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>

1 files changed, 15 insertions, 23 deletions

diff --git a/test/parallel/test-net-settimeout.js b/test/parallel/test-net-settimeout.js
index a1172b92e1..76ed7b020f 100644
--- a/test/parallel/test-net-settimeout.js
+++ b/test/parallel/test-net-settimeout.js
@@ -2,36 +2,28 @@
 // This example sets a timeout then immediately attempts to disable the timeout
 // https://github.com/joyent/node/pull/2245
 
-var common = require('../common');
-var net = require('net');
-var assert = require('assert');
+const common = require('../common');
+const net = require('net');
+const assert = require('assert');
 
-var T = 100;
+const T = 100;
 
-var server = net.createServer(function(c) {
+const server = net.createServer(function(c) {
   c.write('hello');
 });
 server.listen(common.PORT);
 
-var killers = [0];
+const socket = net.createConnection(common.PORT, 'localhost');
 
-var left = killers.length;
-killers.forEach(function(killer) {
-  var socket = net.createConnection(common.PORT, 'localhost');
+const s = socket.setTimeout(T, function() {
+  common.fail('Socket timeout event is not expected to fire');
+});
+assert.ok(s instanceof net.Socket);
 
-  var s = socket.setTimeout(T, function() {
-    socket.destroy();
-    if (--left === 0) server.close();
-    assert.ok(killer !== 0);
-    clearTimeout(timeout);
-  });
-  assert.ok(s instanceof net.Socket);
+socket.setTimeout(0);
 
-  socket.setTimeout(killer);
+setTimeout(function() {
+  socket.destroy();
+  server.close();
+}, T * 2);
 
-  var timeout = setTimeout(function() {
-    socket.destroy();
-    if (--left === 0) server.close();
-    assert.ok(killer === 0);
-  }, T * 2);
-});