Commit 33af09f
test,net: add tests for server.connections
There were no tests confirming situations where server.connections
should return `null`. Add a test for that situation.
Expand existing server.connection test slightly to check value.
Refactor (mostly spacing) code for server.connections setter.
PR-URL: #10762
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent d751afa commit 33af09f
3 files changed
Lines changed: 56 additions & 7 deletions
File tree
- lib
- test/parallel
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1132,9 +1132,8 @@ function Server(options, connectionListener) { | |||
| 1132 | 1132 | return this._connections; | |
| 1133 | 1133 | }, 'Server.connections property is deprecated. ' + | |
| 1134 | 1134 | 'Use Server.getConnections method instead.'), | |
| 1135 | - set: internalUtil.deprecate((val) => { | ||
| 1136 | - return (this._connections = val); | ||
| 1137 | - }, 'Server.connections property is deprecated.'), | ||
| 1135 | + set: internalUtil.deprecate((val) => (this._connections = val), | ||
| 1136 | + 'Server.connections property is deprecated.'), | ||
| 1138 | 1137 | configurable: true, enumerable: false | |
| 1139 | 1138 | }); | |
| 1140 | 1139 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,44 @@ | |||
| 1 | + 'use strict'; | ||
| 2 | + const common = require('../common'); | ||
| 3 | + const assert = require('assert'); | ||
| 4 | + const fork = require('child_process').fork; | ||
| 5 | + const net = require('net'); | ||
| 6 | + | ||
| 7 | + if (process.argv[2] === 'child') { | ||
| 8 | + | ||
| 9 | + process.on('message', (msg, socket) => { | ||
| 10 | + socket.end('goodbye'); | ||
| 11 | + }); | ||
| 12 | + | ||
| 13 | + process.send('hello'); | ||
| 14 | + | ||
| 15 | + } else { | ||
| 16 | + | ||
| 17 | + const child = fork(process.argv[1], ['child']); | ||
| 18 | + | ||
| 19 | + const runTest = common.mustCall(() => { | ||
| 20 | + | ||
| 21 | + const server = net.createServer(); | ||
| 22 | + | ||
| 23 | + // server.connections should start as 0 | ||
| 24 | + assert.strictEqual(server.connections, 0); | ||
| 25 | + server.on('connection', (socket) => { | ||
| 26 | + child.send({what: 'socket'}, socket); | ||
| 27 | + }); | ||
| 28 | + server.on('close', () => { | ||
| 29 | + child.kill(); | ||
| 30 | + }); | ||
| 31 | + | ||
| 32 | + server.listen(0, common.mustCall(() => { | ||
| 33 | + const connect = net.connect(server.address().port); | ||
| 34 | + | ||
| 35 | + connect.on('close', common.mustCall(() => { | ||
| 36 | + // now server.connections should be null | ||
| 37 | + assert.strictEqual(server.connections, null); | ||
| 38 | + server.close(); | ||
| 39 | + })); | ||
| 40 | + })); | ||
| 41 | + }); | ||
| 42 | + | ||
| 43 | + child.on('message', runTest); | ||
| 44 | + } | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,12 +1,18 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - require('../common'); | ||
| 2 | + const common = require('../common'); | ||
| 3 | 3 | const assert = require('assert'); | |
| 4 | 4 | ||
| 5 | 5 | const net = require('net'); | |
| 6 | 6 | ||
| 7 | - // test that server.connections property is no longer enumerable now that it | ||
| 8 | - // has been marked as deprecated | ||
| 9 | - | ||
| 10 | 7 | const server = new net.Server(); | |
| 11 | 8 | ||
| 9 | + const expectedWarning = 'Server.connections property is deprecated. ' + | ||
| 10 | + 'Use Server.getConnections method instead.'; | ||
| 11 | + | ||
| 12 | + common.expectWarning('DeprecationWarning', expectedWarning); | ||
| 13 | + | ||
| 14 | + // test that server.connections property is no longer enumerable now that it | ||
| 15 | + // has been marked as deprecated | ||
| 12 | 16 | assert.strictEqual(Object.keys(server).indexOf('connections'), -1); | |
| 17 | + | ||
| 18 | + assert.strictEqual(server.connections, 0); | ||
0 commit comments