Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test-http2-session-timeout.js and move to parallel #24877

Closed
wants to merge 2 commits into from
Closed

Fix test-http2-session-timeout.js and move to parallel #24877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59bf8fa
test: make http2 timeout test robust
Trott Dec 6, 2018
9c93c03
test: move http2 test to parallel
Trott Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions .../sequential/test-http2-session-timeout.js → test/parallel/test-http2-session-timeout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ if (!common.hasCrypto)
const assert = require('assert');
const http2 = require('http2');

const serverTimeout = common.platformTimeout(200);

let requests = 0;
const mustNotCall = () => {
assert.fail(`Timeout after ${requests} request(s)`);
};

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('timeout', mustNotCall);
Expand All @@ -24,7 +24,7 @@ server.listen(0, common.mustCall(() => {

const url = `http://localhost:${port}`;
const client = http2.connect(url);
const startTime = process.hrtime();
let startTime = process.hrtime();
makeReq();

function makeReq() {
Expand All @@ -42,7 +42,15 @@ server.listen(0, common.mustCall(() => {
request.on('end', () => {
const diff = process.hrtime(startTime);
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();
} else {
server.removeListener('timeout', mustNotCall);
Expand Down
2 changes: 0 additions & 2 deletions test/sequential/sequential.status
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,3 @@ test-http2-large-file: PASS, FLAKY
[$system==aix]

[$arch==arm]
# https://github.com/nodejs/node/issues/20628
test-http2-session-timeout: PASS,FLAKY