Skip to content

Commit d1156da

Browse files
juggernaut451BridgeAR
authored andcommitted
test: refactor parallel/test-tls-async-cb-after-socket-end
PR-URL: #18985 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
1 parent cbc7eb7 commit d1156da

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed
Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,65 @@
11
'use strict';
2-
32
const common = require('../common');
43
if (!common.hasCrypto)
54
common.skip('missing crypto');
65
const fixtures = require('../common/fixtures');
76
const SSL_OP_NO_TICKET = require('crypto').constants.SSL_OP_NO_TICKET;
87
const tls = require('tls');
98

9+
// Check tls async callback after socket ends
10+
1011
const options = {
1112
secureOptions: SSL_OP_NO_TICKET,
1213
key: fixtures.readSync('test_key.pem'),
1314
cert: fixtures.readSync('test_cert.pem')
1415
};
1516

16-
const server = tls.createServer(options, function(c) {
17-
});
17+
const server = tls.createServer(options, common.mustCall());
1818

1919
let sessionCb = null;
2020
let client = null;
2121

22-
server.on('newSession', function(key, session, done) {
22+
server.on('newSession', common.mustCall((key, session, done) => {
2323
done();
24-
});
24+
}));
2525

26-
server.on('resumeSession', function(id, cb) {
26+
server.on('resumeSession', common.mustCall((id, cb) => {
2727
sessionCb = cb;
28-
2928
next();
30-
});
29+
}));
3130

32-
server.listen(0, function() {
31+
server.listen(0, common.mustCall(() => {
3332
const clientOpts = {
34-
port: this.address().port,
33+
port: server.address().port,
3534
rejectUnauthorized: false,
3635
session: false
3736
};
3837

39-
const s1 = tls.connect(clientOpts, function() {
38+
const s1 = tls.connect(clientOpts, common.mustCall(() => {
4039
clientOpts.session = s1.getSession();
4140
console.log('1st secure');
4241

4342
s1.destroy();
44-
const s2 = tls.connect(clientOpts, function(s) {
43+
const s2 = tls.connect(clientOpts, (s) => {
4544
console.log('2nd secure');
4645

4746
s2.destroy();
48-
}).on('connect', function() {
47+
}).on('connect', common.mustCall(() => {
4948
console.log('2nd connected');
5049
client = s2;
5150

5251
next();
53-
});
54-
});
55-
});
52+
}));
53+
}));
54+
}));
5655

5756
function next() {
5857
if (!client || !sessionCb)
5958
return;
6059

6160
client.destroy();
62-
setTimeout(function() {
61+
setTimeout(common.mustCall(() => {
6362
sessionCb();
6463
server.close();
65-
}, 100);
64+
}), 100);
6665
}

0 commit comments

Comments
 (0)