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

test: refactor test-https-agent-additional-options

Browse Source 
Move callback to location where it is less confusing.

PR-URL: https://github.com/nodejs/node/pull/27830
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Rich Trott 2019-05-21 15:27:32 -07:00
parent d03cff7620
commit 0fa5c9f256
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
test/parallel/test-https-agent-additional-options.js
View File

@ -42,7 +42,26 @@ const updatedValues = new Map([
function variations(iter, port, cb) { function variations(iter, port, cb) {
const { done, value } = iter.next(); const { done, value } = iter.next();
if (done) { if (done) {
return common.mustCall(cb); return common.mustCall((res) => {
res.resume();
https.globalAgent.once('free', common.mustCall(() => {
// Verify that different keep-alived connections are created
// for the base call and each variation
const keys = Object.keys(https.globalAgent.freeSockets);
assert.strictEqual(keys.length, 1 + updatedValues.size);
let i = 1;
for (const [, value] of updatedValues) {
assert.ok(
keys[i].startsWith(value.toString() + ':') ||
keys[i].endsWith(':' + value.toString()) ||
keys[i].includes(':' + value.toString() + ':')
);
i++;
}
https.globalAgent.destroy();
server.close();
}));
});
} else { } else {
const [key, val] = value; const [key, val] = value;
return common.mustCall((res) => { return common.mustCall((res) => {
@ -59,30 +78,6 @@ function variations(iter, port, cb) {
server.listen(0, common.mustCall(() => { server.listen(0, common.mustCall(() => {
const port = server.address().port; const port = server.address().port;
const globalAgent = https.globalAgent; https.globalAgent.keepAlive = true;
globalAgent.keepAlive = true; https.get(getBaseOptions(port), variations(updatedValues.entries(), port));
https.get(getBaseOptions(port), variations(
updatedValues.entries(),
port,
common.mustCall((res) => {
res.resume();
globalAgent.once('free', common.mustCall(() => {
// Verify that different keep-alived connections are created
// for the base call and each variation
const keys = Object.keys(globalAgent.freeSockets);
assert.strictEqual(keys.length, 1 + updatedValues.size);
let i = 1;
for (const [, value] of updatedValues) {
assert.ok(
keys[i].startsWith(value.toString() + ':') ||
keys[i].endsWith(':' + value.toString()) ||
keys[i].includes(':' + value.toString() + ':')
);
i++;
}
globalAgent.destroy();
server.close();
}));
})
));
})); }));