Skip to content

Commit 6d03170

Browse files
tlhunterMylesBorins
authored andcommitted
test: clean up net server try ports test
* Replace var's with const and let * Replace boolean flags with common.mustCall() * Using stricter comparisons * Fixed typo in comment PR-URL: #8458 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Brian White <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 389a6d2 commit 6d03170

File tree

1 file changed

+13
-41
lines changed

1 file changed

+13
-41
lines changed
+13-41
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,24 @@
11
'use strict';
2-
// This tests binds to one port, then attempts to start a server on that
2+
// This test binds to one port, then attempts to start a server on that
33
// port. It should be EADDRINUSE but be able to then bind to another port.
4-
require('../common');
5-
var assert = require('assert');
6-
var net = require('net');
4+
const common = require('../common');
5+
const assert = require('assert');
6+
const net = require('net');
77

8-
var server1listening = false;
9-
var server2listening = false;
10-
var server2eaddrinuse = false;
8+
const server1 = net.Server();
119

12-
var server1 = net.Server(function(socket) {
13-
socket.destroy();
14-
});
10+
const server2 = net.Server();
1511

16-
var server2 = net.Server(function(socket) {
17-
socket.destroy();
18-
});
19-
20-
var server2errors = 0;
21-
server2.on('error', function(e) {
22-
server2errors++;
23-
console.error('server2 error');
24-
25-
if (e.code == 'EADDRINUSE') {
26-
server2eaddrinuse = true;
27-
}
28-
29-
server2.listen(0, function() {
30-
console.error('server2 listening');
31-
server2listening = true;
12+
server2.on('error', common.mustCall(function(e) {
13+
assert.strictEqual(e.code, 'EADDRINUSE');
3214

15+
server2.listen(0, common.mustCall(function() {
3316
server1.close();
3417
server2.close();
35-
});
36-
});
18+
}));
19+
}));
3720

38-
39-
server1.listen(0, function() {
40-
console.error('server1 listening');
41-
server1listening = true;
21+
server1.listen(0, common.mustCall(function() {
4222
// This should make server2 emit EADDRINUSE
4323
server2.listen(this.address().port);
44-
});
45-
46-
47-
process.on('exit', function() {
48-
assert.equal(1, server2errors);
49-
assert.ok(server2eaddrinuse);
50-
assert.ok(server2listening);
51-
assert.ok(server1listening);
52-
});
24+
}));

0 commit comments

Comments
 (0)