Skip to content

Commit 53ae059

Browse files
committed
Restructure unit extra-ca-with-options tests as an array
1 parent 6230627 commit 53ae059

File tree

1 file changed

+36
-27
lines changed

1 file changed

+36
-27
lines changed

test/parallel/test-tls-env-extra-ca-with-options.js

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,44 +11,53 @@ const { fork } = require('node:child_process');
1111
const fixtures = require('../common/fixtures');
1212

1313
const tests = [
14-
'additional-ca',
15-
'crl',
16-
'pfx',
14+
{
15+
get clientOptions() {
16+
const secureContext = tls.createSecureContext();
17+
secureContext.context.addCACert(
18+
fixtures.readKey('ca1-cert.pem')
19+
);
20+
21+
return {
22+
secureContext
23+
};
24+
}
25+
},
26+
{
27+
clientOptions: {
28+
crl: fixtures.readKey('ca2-crl.pem')
29+
}
30+
},
31+
{
32+
clientOptions: {
33+
pfx: fixtures.readKey('agent1.pfx'),
34+
passphrase: 'sample'
35+
}
36+
},
1737
];
1838

19-
const clientTest = process.argv[2];
20-
if (clientTest) {
39+
if (process.argv[2]) {
40+
const testNumber = parseInt(process.argv[2], 10);
41+
assert(testNumber >= 0 && testNumber < tests.length);
42+
43+
const test = tests[testNumber];
44+
2145
const clientOptions = {
46+
...test.clientOptions,
2247
port: process.argv[3],
2348
checkServerIdentity: common.mustCall()
2449
};
2550

26-
switch (clientTest) {
27-
case 'additional-ca':
28-
clientOptions.secureContext = tls.createSecureContext();
29-
clientOptions.secureContext.context.addCACert(
30-
fixtures.readKey('ca1-cert.pem')
31-
);
32-
break;
33-
case 'crl':
34-
clientOptions.crl = fixtures.readKey('ca2-crl.pem');
35-
break;
36-
case 'pfx':
37-
clientOptions.pfx = fixtures.readKey('agent1.pfx');
38-
clientOptions.passphrase = 'sample';
39-
break;
40-
}
41-
4251
const client = tls.connect(clientOptions, common.mustCall(() => {
4352
client.end('hi');
4453
}));
4554
} else {
46-
for (const test of tests) {
47-
const serverOptions = {
48-
key: fixtures.readKey('agent3-key.pem'),
49-
cert: fixtures.readKey('agent3-cert.pem')
50-
};
55+
const serverOptions = {
56+
key: fixtures.readKey('agent3-key.pem'),
57+
cert: fixtures.readKey('agent3-cert.pem')
58+
};
5159

60+
for (const testNumber in tests) {
5261
const server = tls.createServer(serverOptions, common.mustCall((socket) => {
5362
socket.end('bye');
5463
server.close();
@@ -61,7 +70,7 @@ if (clientTest) {
6170
};
6271

6372
const args = [
64-
test,
73+
testNumber,
6574
server.address().port,
6675
];
6776

0 commit comments

Comments
 (0)