From 790406661db24f9296f310a68f78ddb87d1f5ccc Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 4 Oct 2016 16:16:38 -0700 Subject: [PATCH] test: refactor test-net-server-max-connections The test timed out on Windows in CI. Made the following changes: * reduced total connections from 200 to 20 * var -> const * string concatenation -> templates * assert.equal -> assert.strictEqual PR-URL: https://github.com/nodejs/node/pull/8931 Reviewed-By: Santiago Gimeno Reviewed-By: James M Snell Reviewed-By: Luigi Pinca --- .../test-net-server-max-connections.js | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/test/parallel/test-net-server-max-connections.js b/test/parallel/test-net-server-max-connections.js index 661c18113b..99d3b345f4 100644 --- a/test/parallel/test-net-server-max-connections.js +++ b/test/parallel/test-net-server-max-connections.js @@ -1,23 +1,21 @@ 'use strict'; -var common = require('../common'); -var assert = require('assert'); +const common = require('../common'); +const assert = require('assert'); -var net = require('net'); +const net = require('net'); -// This test creates 200 connections to a server and sets the server's -// maxConnections property to 100. The first 100 connections make it through -// and the last 100 connections are rejected. +// This test creates 20 connections to a server and sets the server's +// maxConnections property to 10. The first 10 connections make it through +// and the last 10 connections are rejected. -var N = 200; -var count = 0; +const N = 20; var closes = 0; -var waits = []; +const waits = []; -var server = net.createServer(function(connection) { - console.error('connect %d', count++); +const server = net.createServer(common.mustCall(function(connection) { connection.write('hello'); waits.push(function() { connection.end(); }); -}); +}, N / 2)); server.listen(0, function() { makeConnection(0); @@ -25,11 +23,9 @@ server.listen(0, function() { server.maxConnections = N / 2; -console.error('server.maxConnections = %d', server.maxConnections); - function makeConnection(index) { - var c = net.createConnection(server.address().port); + const c = net.createConnection(server.address().port); var gotData = false; c.on('connect', function() { @@ -42,10 +38,10 @@ function makeConnection(index) { closes++; if (closes < N / 2) { - assert.ok(server.maxConnections <= index, - index + - ' was one of the first closed connections ' + - 'but shouldnt have been'); + assert.ok( + server.maxConnections <= index, + `${index} should not have been one of the first closed connections` + ); } if (closes === N / 2) { @@ -58,11 +54,11 @@ function makeConnection(index) { } if (index < server.maxConnections) { - assert.equal(true, gotData, - index + ' didn\'t get data, but should have'); + assert.strictEqual(true, gotData, + `${index} didn't get data, but should have`); } else { - assert.equal(false, gotData, - index + ' got data, but shouldn\'t have'); + assert.strictEqual(false, gotData, + `${index} got data, but shouldn't have`); } }); }); @@ -86,5 +82,5 @@ function makeConnection(index) { process.on('exit', function() { - assert.equal(N, closes); + assert.strictEqual(N, closes); });