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

test: fix flaky HTTP server tests #42846

Merged
merged 1 commit into from
Apr 24, 2022
Merged

test: fix flaky HTTP server tests #42846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions test/parallel/test-http-server-headers-timeout-keepalive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ function performRequestWithDelay(client, firstDelay, secondDelay, closeAfter) {
client.resume();
client.write('GET / HTTP/1.1\r\n');

firstDelay = common.platformTimeout(firstDelay);
secondDelay = common.platformTimeout(secondDelay);

setTimeout(() => {
client.write('Connection: ');
}, firstDelay).unref();
Expand All @@ -27,12 +24,12 @@ function performRequestWithDelay(client, firstDelay, secondDelay, closeAfter) {
}, firstDelay + secondDelay).unref();
}

const headersTimeout = common.platformTimeout(1000);
const headersTimeout = common.platformTimeout(2000);
const server = createServer({
headersTimeout,
requestTimeout: 0,
keepAliveTimeout: 0,
connectionsCheckingInterval: common.platformTimeout(250),
connectionsCheckingInterval: headersTimeout / 4,
}, common.mustCallAtLeast((req, res) => {
res.writeHead(200, { 'Content-Type': 'text/plain' });
res.end();
Expand Down Expand Up @@ -60,7 +57,7 @@ server.listen(0, common.mustCall(() => {
'HTTP/1.1 200 OK'
);

const defer = common.platformTimeout(headersTimeout * 1.5);
const defer = headersTimeout * 1.5;

// Wait some time to make sure headersTimeout
// does not interfere with keep alive
Expand Down
9 changes: 3 additions & 6 deletions test/parallel/test-http-server-request-timeout-keepalive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ function performRequestWithDelay(client, firstDelay, secondDelay, closeAfter) {
client.resume();
client.write('GET / HTTP/1.1\r\n');

firstDelay = common.platformTimeout(firstDelay);
secondDelay = common.platformTimeout(secondDelay);

setTimeout(() => {
client.write('Connection: ');
}, firstDelay).unref();
Expand All @@ -27,12 +24,12 @@ function performRequestWithDelay(client, firstDelay, secondDelay, closeAfter) {
}, firstDelay + secondDelay).unref();
}

const requestTimeout = common.platformTimeout(1000);
const requestTimeout = common.platformTimeout(2000);
const server = createServer({
headersTimeout: 0,
requestTimeout,
keepAliveTimeout: 0,
connectionsCheckingInterval: common.platformTimeout(250),
connectionsCheckingInterval: requestTimeout / 4
}, common.mustCallAtLeast((req, res) => {
res.writeHead(200, { 'Content-Type': 'text/plain' });
res.end();
Expand All @@ -58,7 +55,7 @@ server.listen(0, common.mustCall(() => {
'HTTP/1.1 200 OK'
);

const defer = common.platformTimeout(requestTimeout * 1.5);
const defer = requestTimeout * 1.5;

// Wait some time to make sure requestTimeout
// does not interfere with keep alive
Expand Down