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

test: make http2 timeout test robust

Browse Source 
Instead of using magic values for the server timeout in
test-http2-session-timeout, measure the duration of the first request
(which should be longer than subsequent requests) and use that value.

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

PR-URL: https://github.com/nodejs/node/pull/24877
Fixes: https://github.com/https://github.com/nodejs/node/issues/20628
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
This commit is contained in:
Rich Trott 2018-12-06 10:21:05 -08:00
parent 008b904c06
commit 3fe00effe0
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/sequential/sequential.status
View File

@ -23,5 +23,3 @@ test-http2-large-file: PASS, FLAKY
[$system==aix] [$system==aix]
[$arch==arm] [$arch==arm]
# https://github.com/nodejs/node/issues/20628
test-http2-session-timeout: PASS,FLAKY

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

@ -6,15 +6,15 @@ if (!common.hasCrypto)
const assert = require('assert'); const assert = require('assert');
const http2 = require('http2'); const http2 = require('http2');
const serverTimeout = common.platformTimeout(200);
let requests = 0; let requests = 0;
const mustNotCall = () => { const mustNotCall = () => {
assert.fail(`Timeout after ${requests} request(s)`); assert.fail(`Timeout after ${requests} request(s)`);
}; };
const server = http2.createServer(); const server = http2.createServer();
server.timeout = serverTimeout; // Disable server timeout until first request. We will set the timeout based on
// how long the first request takes.
server.timeout = 0;
server.on('request', (req, res) => res.end()); server.on('request', (req, res) => res.end());
server.on('timeout', mustNotCall); server.on('timeout', mustNotCall);
@ -24,7 +24,7 @@ server.listen(0, common.mustCall(() => {
const url = `http://localhost:${port}`; const url = `http://localhost:${port}`;
const client = http2.connect(url); const client = http2.connect(url);
const startTime = process.hrtime(); let startTime = process.hrtime();
makeReq(); makeReq();
function makeReq() { function makeReq() {
@ -42,7 +42,15 @@ server.listen(0, common.mustCall(() => {
request.on('end', () => { request.on('end', () => {
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 (server.timeout === 0) {
// Set the timeout now. First connection will take significantly longer
// than subsequent connections, so using the duration of the first
// connection as the timeout should be robust. Double it anyway for good
// measure.
server.timeout = milliseconds * 2;
startTime = process.hrtime();
makeReq();
} else if (milliseconds < server.timeout * 2) {
makeReq(); makeReq();
} else { } else {
server.removeListener('timeout', mustNotCall); server.removeListener('timeout', mustNotCall);