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

test: use common.mustCall in test-https-strict

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/12668
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
weewey 2017-04-26 22:20:35 +08:00 committed by James M Snell
parent 972bfe1514
commit f11d4a1556
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/parallel/test-https-strict.js
View File

@ -91,8 +91,6 @@ server2.listen(0, listening());
server3.listen(0, listening()); server3.listen(0, listening());
const responseErrors = {}; const responseErrors = {};
let expectResponseCount = 0;
let responseCount = 0;
let pending = 0; let pending = 0;
@ -147,17 +145,14 @@ function makeReq(path, port, error, host, ca) {
options.headers = { host: host }; options.headers = { host: host };
} }
const req = https.get(options); const req = https.get(options);
expectResponseCount++;
const server = port === server1.address().port ? server1 : const server = port === server1.address().port ? server1 :
port === server2.address().port ? server2 : port === server2.address().port ? server2 :
port === server3.address().port ? server3 : port === server3.address().port ? server3 :
null; null;
if (!server) throw new Error('invalid port: ' + port); if (!server) throw new Error('invalid port: ' + port);
server.expectCount++; server.expectCount++;
req.on('response', (res) => { req.on('response', common.mustCall((res) => {
responseCount++;
assert.strictEqual(res.connection.authorizationError, error); assert.strictEqual(res.connection.authorizationError, error);
responseErrors[path] = res.connection.authorizationError; responseErrors[path] = res.connection.authorizationError;
pending--; pending--;
@ -167,7 +162,7 @@ function makeReq(path, port, error, host, ca) {
server3.close(); server3.close();
} }
res.resume(); res.resume();
}); }));
} }
function allListening() { function allListening() {
@ -220,5 +215,4 @@ process.on('exit', () => {
assert.strictEqual(server1.requests.length, server1.expectCount); assert.strictEqual(server1.requests.length, server1.expectCount);
assert.strictEqual(server2.requests.length, server2.expectCount); assert.strictEqual(server2.requests.length, server2.expectCount);
assert.strictEqual(server3.requests.length, server3.expectCount); assert.strictEqual(server3.requests.length, server3.expectCount);
assert.strictEqual(responseCount, expectResponseCount);
}); });