test: simplify test-tls-alert
Avoid the process 'exit' event handler and use execFile instead of manual stream operations. Refs: https://github.com/nodejs/node/pull/46751 PR-URL: https://github.com/nodejs/node/pull/46805 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
4881770bb3
commit
78b911ddaf
@ -28,12 +28,10 @@ if (!common.opensslCli)
|
|||||||
common.skip('node compiled without OpenSSL CLI.');
|
common.skip('node compiled without OpenSSL CLI.');
|
||||||
|
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const { spawn } = require('child_process');
|
const { execFile } = require('child_process');
|
||||||
const tls = require('tls');
|
const tls = require('tls');
|
||||||
const fixtures = require('../common/fixtures');
|
const fixtures = require('../common/fixtures');
|
||||||
|
|
||||||
let success = false;
|
|
||||||
|
|
||||||
function loadPEM(n) {
|
function loadPEM(n) {
|
||||||
return fixtures.readKey(`${n}.pem`);
|
return fixtures.readKey(`${n}.pem`);
|
||||||
}
|
}
|
||||||
@ -42,21 +40,13 @@ const server = tls.Server({
|
|||||||
secureProtocol: 'TLSv1_2_server_method',
|
secureProtocol: 'TLSv1_2_server_method',
|
||||||
key: loadPEM('agent2-key'),
|
key: loadPEM('agent2-key'),
|
||||||
cert: loadPEM('agent2-cert')
|
cert: loadPEM('agent2-cert')
|
||||||
}, null).listen(0, function() {
|
}, null).listen(0, common.mustCall(() => {
|
||||||
const args = ['s_client', '-quiet', '-tls1_1',
|
const args = ['s_client', '-quiet', '-tls1_1',
|
||||||
'-connect', `127.0.0.1:${this.address().port}`];
|
'-connect', `127.0.0.1:${server.address().port}`];
|
||||||
|
|
||||||
const client = spawn(common.opensslCli, args);
|
execFile(common.opensslCli, args, common.mustCall((err, _, stderr) => {
|
||||||
let out = '';
|
assert.strictEqual(err.code, 1);
|
||||||
client.stderr.setEncoding('utf8');
|
assert.match(stderr, /SSL alert number 70/);
|
||||||
client.stderr.on('data', function(d) {
|
server.close();
|
||||||
out += d;
|
}));
|
||||||
if (/SSL alert number 70/.test(out)) {
|
}));
|
||||||
success = true;
|
|
||||||
server.close();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
process.on('exit', function() {
|
|
||||||
assert(success);
|
|
||||||
});
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user