FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test: use consistent timeouts · nodejs/node@56c47b5 · GitHub

/ node Public

Commit 56c47b5

Browse files
authored and
RafaelGSS
committed
test: use consistent timeouts
PR-URL: #42893 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Co-authored-by: Luigi Pinca <luigipinca@gmail.com>
1 parent 2f192c4 commit 56c47b5

11 files changed

Lines changed: 153 additions & 22 deletions

‎test/parallel/test-http-server-headers-timeout-delayed-headers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ const { connect } = require('net');
1010
// pauses before start sending the request.
1111

1212
let sendDelayedRequestHeaders;
13-
const headersTimeout = common.platformTimeout(1000);
13+
const headersTimeout = common.platformTimeout(2000);
1414
const server = createServer({
1515
headersTimeout,
1616
requestTimeout: 0,
1717
keepAliveTimeout: 0,
18-
connectionsCheckingInterval: common.platformTimeout(250),
18+
connectionsCheckingInterval: headersTimeout / 4,
1919
}, common.mustNotCall());
2020
server.on('connection', common.mustCall(() => {
2121
assert.strictEqual(typeof sendDelayedRequestHeaders, 'function');

‎test/parallel/test-http-server-headers-timeout-interrupted-headers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ const { connect } = require('net');
1010
// pauses sending in the middle of a header.
1111

1212
let sendDelayedRequestHeaders;
13-
const headersTimeout = common.platformTimeout(1000);
13+
const headersTimeout = common.platformTimeout(2000);
1414
const server = createServer({
1515
headersTimeout,
1616
requestTimeout: 0,
1717
keepAliveTimeout: 0,
18-
connectionsCheckingInterval: common.platformTimeout(250),
18+
connectionsCheckingInterval: headersTimeout / 4,
1919
}, common.mustNotCall());
2020
server.on('connection', common.mustCall(() => {
2121
assert.strictEqual(typeof sendDelayedRequestHeaders, 'function');

‎test/parallel/test-http-server-headers-timeout-pipelining.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ const { connect } = require('net');
99
// after server.requestTimeout if the client
1010
// does not complete a request when using pipelining.
1111

12-
const headersTimeout = common.platformTimeout(1000);
12+
const headersTimeout = common.platformTimeout(2000);
1313
const server = createServer({
1414
headersTimeout,
1515
requestTimeout: 0,
1616
keepAliveTimeout: 0,
17-
connectionsCheckingInterval: common.platformTimeout(250),
17+
connectionsCheckingInterval: headersTimeout / 4,
1818
}, common.mustCallAtLeast((req, res) => {
1919
res.writeHead(200, { 'Content-Type': 'text/plain' });
2020
res.end();

‎test/parallel/test-http-server-request-timeout-delayed-body.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ const { connect } = require('net');
1010
// pauses before start sending the body.
1111

1212
let sendDelayedRequestBody;
13-
const requestTimeout = common.platformTimeout(1000);
13+
const requestTimeout = common.platformTimeout(2000);
1414
const server = createServer({
1515
headersTimeout: 0,
1616
requestTimeout,
1717
keepAliveTimeout: 0,
18-
connectionsCheckingInterval: common.platformTimeout(250),
18+
connectionsCheckingInterval: requestTimeout / 4,
1919
}, common.mustCall((req, res) => {
2020
let body = '';
2121
req.setEncoding('utf-8');

‎test/parallel/test-http-server-request-timeout-delayed-headers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ const { connect } = require('net');
1010
// pauses before start sending the request.
1111

1212
let sendDelayedRequestHeaders;
13-
const requestTimeout = common.platformTimeout(1000);
13+
const requestTimeout = common.platformTimeout(2000);
1414
const server = createServer({
1515
headersTimeout: 0,
1616
requestTimeout,
1717
keepAliveTimeout: 0,
18-
connectionsCheckingInterval: common.platformTimeout(250),
18+
connectionsCheckingInterval: requestTimeout / 4,
1919
}, common.mustNotCall());
2020
server.on('connection', common.mustCall(() => {
2121
assert.strictEqual(typeof sendDelayedRequestHeaders, 'function');

‎test/parallel/test-http-server-request-timeout-interrupted-body.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ const { connect } = require('net');
1010
// pauses sending in the middle of the body.
1111

1212
let sendDelayedRequestBody;
13-
const requestTimeout = common.platformTimeout(1000);
13+
const requestTimeout = common.platformTimeout(2000);
1414
const server = createServer({
1515
headersTimeout: 0,
1616
requestTimeout,
1717
keepAliveTimeout: 0,
18-
connectionsCheckingInterval: common.platformTimeout(250),
18+
connectionsCheckingInterval: requestTimeout / 4,
1919
}, common.mustCall((req, res) => {
2020
let body = '';
2121
req.setEncoding('utf-8');

‎test/parallel/test-http-server-request-timeout-interrupted-headers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ const { connect } = require('net');
1010
// pauses sending in the middle of a header.
1111

1212
let sendDelayedRequestHeaders;
13-
const requestTimeout = common.platformTimeout(1000);
13+
const requestTimeout = common.platformTimeout(2000);
1414
const server = createServer({
1515
headersTimeout: 0,
1616
requestTimeout,
1717
keepAliveTimeout: 0,
18-
connectionsCheckingInterval: common.platformTimeout(250),
18+
connectionsCheckingInterval: requestTimeout / 4,
1919
}, common.mustNotCall());
2020
server.on('connection', common.mustCall(() => {
2121
assert.strictEqual(typeof sendDelayedRequestHeaders, 'function');

‎test/parallel/test-http-server-request-timeout-keepalive.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ server.listen(0, common.mustCall(() => {
6767
performRequestWithDelay(
6868
client,
6969
requestTimeout / 5,
70-
requestTimeout,
70+
requestTimeout * 2,
7171
true
7272
);
7373
}, defer).unref();
@@ -88,7 +88,7 @@ server.listen(0, common.mustCall(() => {
8888
client.on('error', errOrEnd);
8989
client.on('end', errOrEnd);
9090

91-
// Perform a second request expected to finish before requestTimeout
91+
// Perform a first request which is completed immediately
9292
performRequestWithDelay(
9393
client,
9494
requestTimeout / 5,

‎test/parallel/test-http-server-request-timeout-pipelining.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ const { connect } = require('net');
99
// after server.requestTimeout if the client
1010
// does not complete a request when using pipelining.
1111

12-
const requestTimeout = common.platformTimeout(1000);
12+
const requestTimeout = common.platformTimeout(2000);
1313
const server = createServer({
1414
headersTimeout: 0,
1515
requestTimeout,
1616
keepAliveTimeout: 0,
17-
connectionsCheckingInterval: common.platformTimeout(250),
17+
connectionsCheckingInterval: requestTimeout / 4
1818
}, common.mustCallAtLeast((req, res) => {
1919
res.writeHead(200, { 'Content-Type': 'text/plain' });
2020
res.end();
@@ -66,5 +66,5 @@ server.listen(0, common.mustCall(() => {
6666
// Complete the request
6767
setTimeout(() => {
6868
client.write('close\r\n\r\n');
69-
}, requestTimeout * 1.5).unref();
69+
}, requestTimeout * 2).unref();
7070
}));

‎test/parallel/test-http-server-request-timeout-upgrade.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ const { connect } = require('net');
88
// This test validates that the requestTimeoout
99
// is disabled after the connection is upgraded.
1010
let sendDelayedRequestHeaders;
11-
const requestTimeout = common.platformTimeout(1000);
11+
const requestTimeout = common.platformTimeout(2000);
1212
const server = createServer({
1313
headersTimeout: 0,
1414
requestTimeout,
1515
keepAliveTimeout: 0,
16-
connectionsCheckingInterval: common.platformTimeout(250),
16+
connectionsCheckingInterval: requestTimeout / 4
1717
}, common.mustNotCall());
1818
server.on('connection', common.mustCall(() => {
1919
assert.strictEqual(typeof sendDelayedRequestHeaders, 'function');
@@ -58,6 +58,6 @@ server.listen(0, common.mustCall(() => {
5858
setTimeout(() => {
5959
client.write('12345678901234567890');
6060
client.end();
61-
}, common.platformTimeout(2000)).unref();
61+
}, requestTimeout * 2).unref();
6262
});
6363
}));

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL