From cd8a1fb17ce32c423dd42db8010723ee0db73188 Mon Sep 17 00:00:00 2001 From: Kai Tamkun Date: Thu, 27 Feb 2025 17:14:37 -0800 Subject: [PATCH] Partially fix node-http.test.ts --- src/js/node/http.ts | 2 +- test/js/node/http/fixtures/log-events.mjs | 22 ------------------- test/js/node/http/node-http.test.ts | 2 +- .../test/parallel/test-pipe-file-to-http.js | 10 ++++++--- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/js/node/http.ts b/src/js/node/http.ts index 81aa6e38f6..cfd6e3895c 100644 --- a/src/js/node/http.ts +++ b/src/js/node/http.ts @@ -1832,7 +1832,7 @@ function onServerResponseClose() { let OriginalWriteHeadFn, OriginalImplicitHeadFn; function ServerResponse(req, options) { - if (!new.target) { + if (!(this instanceof ServerResponse)) { return new ServerResponse(req, options); } diff --git a/test/js/node/http/fixtures/log-events.mjs b/test/js/node/http/fixtures/log-events.mjs index c4190b066a..ef087634dc 100644 --- a/test/js/node/http/fixtures/log-events.mjs +++ b/test/js/node/http/fixtures/log-events.mjs @@ -27,26 +27,4 @@ function patchEmitter(emitter, prefix) { oldEmit.apply(emitter, arguments); }; - - const req = http.request(options, res => { - patchEmitter(res, "res"); - console.log(`STATUS: ${res.statusCode}`); - res.setEncoding("utf8"); - }); - patchEmitter(req, "req"); - - req.end().once("close", () => { - setTimeout(() => { - server.close(); - }, 1); - }); - - function patchEmitter(emitter, prefix) { - var oldEmit = emitter.emit; - - emitter.emit = function () { - console.log([prefix, arguments[0]]); - oldEmit.apply(emitter, arguments); - }; - } } diff --git a/test/js/node/http/node-http.test.ts b/test/js/node/http/node-http.test.ts index 9669aa95a0..f8877778f9 100644 --- a/test/js/node/http/node-http.test.ts +++ b/test/js/node/http/node-http.test.ts @@ -2061,7 +2061,7 @@ it("should work when sending https.request with agent:false", async () => { await promise; }); -it("client should use chunked encoded if more than one write is called", async () => { +it("client should use chunked encoding if more than one write is called", async () => { function sleep(ms) { return new Promise(resolve => setTimeout(resolve, ms)); } diff --git a/test/js/node/test/parallel/test-pipe-file-to-http.js b/test/js/node/test/parallel/test-pipe-file-to-http.js index 6c1244427d..ffbab21f71 100644 --- a/test/js/node/test/parallel/test-pipe-file-to-http.js +++ b/test/js/node/test/parallel/test-pipe-file-to-http.js @@ -32,11 +32,10 @@ const filename = tmpdir.resolve('big'); 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); @@ -55,7 +54,12 @@ const server = http.createServer((req, res) => { server.listen(0); server.on('listening', () => { - common.createZeroFilledFile(filename); + + // Create a zero-filled file + const fd = fs.openSync(filename, 'w'); + fs.ftruncateSync(fd, 10 * 1024 * 1024); + fs.closeSync(fd); + makeRequest(); });