From 7b249cb4e2605ba34d1ab952b76fdf1d972a75e2 Mon Sep 17 00:00:00 2001 From: jakecastelli <959672929@qq.com> Date: Fri, 7 Jun 2024 23:22:07 +0930 Subject: [PATCH 1/2] test: fix flaky timeout --- test/common/index.js | 4 ++-- test/parallel/test-pipe-file-to-http.js | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/test/common/index.js b/test/common/index.js index ea21d15c104ac3..5986f573fc99fe 100644 --- a/test/common/index.js +++ b/test/common/index.js @@ -264,9 +264,9 @@ function childShouldThrowAndAbort() { }); } -function createZeroFilledFile(filename) { +function createZeroFilledFile(filename, size = 10 * 1024 * 1024) { const fd = fs.openSync(filename, 'w'); - fs.ftruncateSync(fd, 10 * 1024 * 1024); + fs.ftruncateSync(fd, size); fs.closeSync(fd); } diff --git a/test/parallel/test-pipe-file-to-http.js b/test/parallel/test-pipe-file-to-http.js index 6c1244427d9fa7..a7fcf912f18c09 100644 --- a/test/parallel/test-pipe-file-to-http.js +++ b/test/parallel/test-pipe-file-to-http.js @@ -29,16 +29,16 @@ const tmpdir = require('../common/tmpdir'); tmpdir.refresh(); const filename = tmpdir.resolve('big'); +const fileSize = 5 * 1024 * 1024; let count = 0; const server = http.createServer((req, res) => { - let timeoutId; assert.strictEqual(req.method, 'POST'); req.pause(); - setTimeout(() => { + const timeoutId = setTimeout(() => { req.resume(); - }, 1000); + }, common.platformTimeout(1000)); req.on('data', (chunk) => { count += chunk.length; @@ -55,7 +55,7 @@ const server = http.createServer((req, res) => { server.listen(0); server.on('listening', () => { - common.createZeroFilledFile(filename); + common.createZeroFilledFile(filename, fileSize); makeRequest(); }); @@ -73,11 +73,8 @@ function makeRequest() { req.on('response', (res) => { res.resume(); res.on('end', () => { + assert.strictEqual(count, fileSize); server.close(); }); }); } - -process.on('exit', () => { - assert.strictEqual(count, 1024 * 10240); -}); From 4bcfdf4c80bb88fbaf19dd2881f2659580cb7909 Mon Sep 17 00:00:00 2001 From: jakecastelli <959672929@qq.com> Date: Thu, 27 Jun 2024 21:47:45 +0930 Subject: [PATCH 2/2] fixup! remove platformTimeout --- test/parallel/test-pipe-file-to-http.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-pipe-file-to-http.js b/test/parallel/test-pipe-file-to-http.js index a7fcf912f18c09..bae384d4a32500 100644 --- a/test/parallel/test-pipe-file-to-http.js +++ b/test/parallel/test-pipe-file-to-http.js @@ -38,7 +38,7 @@ const server = http.createServer((req, res) => { const timeoutId = setTimeout(() => { req.resume(); - }, common.platformTimeout(1000)); + }, 1000); req.on('data', (chunk) => { count += chunk.length;