1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: use mustCall(), not global state checks

Browse Source 
Instead of pushing state into global arrays and checking the results
before exit, use common.mustCall() and make the checks immediately.

PR-URL: https://github.com/nodejs/node/pull/25508
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Sam Roberts 2019-02-01 12:21:01 -08:00
parent b52a8f3507
commit d597b9193f
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/parallel/test-tls-socket-constructor-alpn-options-parsing.js
View File

@ -20,8 +20,6 @@ const fixtures = require('../common/fixtures');
const key = fixtures.readKey('agent1-key.pem'); const key = fixtures.readKey('agent1-key.pem');
const cert = fixtures.readKey('agent1-cert.pem'); const cert = fixtures.readKey('agent1-cert.pem');
const protocols = [];
const server = net.createServer(common.mustCall((s) => { const server = net.createServer(common.mustCall((s) => {
const tlsSocket = new tls.TLSSocket(s, { const tlsSocket = new tls.TLSSocket(s, {
isServer: true, isServer: true,
@ -32,10 +30,9 @@ const server = net.createServer(common.mustCall((s) => {
}); });
tlsSocket.on('secure', common.mustCall(() => { tlsSocket.on('secure', common.mustCall(() => {
protocols.push({ assert.strictEqual(tlsSocket.alpnProtocol, 'http/1.1');
alpnProtocol: tlsSocket.alpnProtocol,
});
tlsSocket.end(); tlsSocket.end();
server.close();
})); }));
})); }));
@ -46,13 +43,7 @@ server.listen(0, common.mustCall(() => {
ALPNProtocols: ['h2', 'http/1.1'] ALPNProtocols: ['h2', 'http/1.1']
}; };
tls.connect(alpnOpts, function() { tls.connect(alpnOpts, common.mustCall(function() {
this.end(); this.end();
}));
server.close();
assert.deepStrictEqual(protocols, [
{ alpnProtocol: 'http/1.1' },
]);
});
})); }));