Skip to content

Commit fc13cc6

Browse files
Trottaddaleax
authored andcommitted
test:refactor test-tls-hello-parser-failure
* setTimeout() with no duration -> setImmediate() * add common.mustCall() where appropriate * var -> const * .on() -> .once() PR-URL: #9715 Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent 44ae028 commit fc13cc6

File tree

1 file changed

+22
-25
lines changed

1 file changed

+22
-25
lines changed
+22-25
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,43 @@
11
'use strict';
2-
var common = require('../common');
3-
var assert = require('assert');
2+
3+
const common = require('../common');
44

55
if (!common.hasCrypto) {
66
common.skip('missing crypto');
77
return;
88
}
9-
var tls = require('tls');
109

11-
var net = require('net');
12-
var fs = require('fs');
10+
const assert = require('assert');
11+
const tls = require('tls');
12+
13+
const net = require('net');
14+
const fs = require('fs');
1315

14-
var options = {
16+
const options = {
1517
key: fs.readFileSync(common.fixturesDir + '/test_key.pem'),
1618
cert: fs.readFileSync(common.fixturesDir + '/test_cert.pem')
1719
};
1820

19-
var bonkers = Buffer.alloc(1024 * 1024, 42);
21+
const bonkers = Buffer.alloc(1024 * 1024, 42);
2022

21-
var server = tls.createServer(options, function(c) {
23+
const server = tls.createServer(options, function(c) {
2224

23-
}).listen(0, function() {
24-
var client = net.connect(this.address().port, function() {
25+
}).listen(0, common.mustCall(function() {
26+
const client = net.connect(this.address().port, common.mustCall(function() {
2527
client.write(bonkers);
26-
});
28+
}));
2729

28-
var once = false;
29-
30-
var writeAgain = setTimeout(function() {
30+
const writeAgain = setImmediate(function() {
3131
client.write(bonkers);
3232
});
3333

34-
client.on('error', function(err) {
35-
if (!once) {
36-
clearTimeout(writeAgain);
37-
once = true;
38-
client.destroy();
39-
server.close();
40-
}
41-
});
34+
client.once('error', common.mustCall(function(err) {
35+
clearImmediate(writeAgain);
36+
client.destroy();
37+
server.close();
38+
}));
4239

43-
client.on('close', function(hadError) {
40+
client.on('close', common.mustCall(function(hadError) {
4441
assert.strictEqual(hadError, true, 'Client never errored');
45-
});
46-
});
42+
}));
43+
}));

0 commit comments

Comments
 (0)