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

test: improve reliability in http2-session-timeout

Browse Source 
Use `setImmediate()` instead of `setTimeout()` to improve robustness of
test-http2-session-timeout.

Fixes: https://github.com/nodejs/node/issues/20628

PR-URL: https://github.com/nodejs/node/pull/22026
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
This commit is contained in:
Rich Trott 2018-07-29 19:26:27 -07:00
parent 9aebcc2b85
commit d2ffcac55d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/sequential/test-http2-session-timeout.js
View File

@ -3,13 +3,12 @@
const common = require('../common'); const common = require('../common');
if (!common.hasCrypto) if (!common.hasCrypto)
common.skip('missing crypto'); common.skip('missing crypto');
const h2 = require('http2'); const http2 = require('http2');
const serverTimeout = common.platformTimeout(200); const serverTimeout = common.platformTimeout(200);
const callTimeout = common.platformTimeout(20);
const mustNotCall = common.mustNotCall(); const mustNotCall = common.mustNotCall();
const server = h2.createServer(); const server = http2.createServer();
server.timeout = serverTimeout; server.timeout = serverTimeout;
server.on('request', (req, res) => res.end()); server.on('request', (req, res) => res.end());
@ -19,7 +18,7 @@ server.listen(0, common.mustCall(() => {
const port = server.address().port; const port = server.address().port;
const url = `http://localhost:${port}`; const url = `http://localhost:${port}`;
const client = h2.connect(url); const client = http2.connect(url);
const startTime = process.hrtime(); const startTime = process.hrtime();
makeReq(); makeReq();
@ -37,7 +36,7 @@ server.listen(0, common.mustCall(() => {
const diff = process.hrtime(startTime); const diff = process.hrtime(startTime);
const milliseconds = (diff[0] * 1e3 + diff[1] / 1e6); const milliseconds = (diff[0] * 1e3 + diff[1] / 1e6);
if (milliseconds < serverTimeout * 2) { if (milliseconds < serverTimeout * 2) {
setTimeout(makeReq, callTimeout); setImmediate(makeReq);
} else { } else {
server.removeListener('timeout', mustNotCall); server.removeListener('timeout', mustNotCall);
server.close(); server.close();