8000 test: ensure assertions are reached on HTTP tests by aduh95 · Pull Request #60729 · nodejs/node · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion test/eslint.config_partial.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export default [
`test/parallel/test-{${
// 0x61 is code for 'a', this generates a string enumerating latin letters: 'a*,b*,…'
Array.from({ length: 4 }, (_, i) => String.fromCharCode(0x61 + i, 42)).join(',')
},${
},http-*,${
// 0x61 is code for 'a', this generates a string enumerating latin letters: 'z*,y*,…'
Array.from({ length: 5 }, (_, i) => String.fromCharCode(0x61 + 25 - i, 42)).join(',')
}}.{js,mjs,cjs}`,
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-http-1.0.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function test(handler, request_generator, response_validator) {
let server_response = '';

server.listen(0);
server.on('listening', function() {
server.on('listening', common.mustCall(function() {
const c = net.createConnection(this.address().port);

c.setEncoding('utf8');
Expand All @@ -53,7 +53,7 @@ function test(handler, request_generator, response_validator) {
server.close();
response_validator(server_response, client_got_eof, false);
}));
});
}));
}

{
Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-http-abort-queued.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ server.listen(0, common.mustCall(() => {
};

const req1 = http.request(options);
req1.on('response', (res1) => {
req1.on('response', common.mustCall((res1) => {
assert.strictEqual(Object.keys(agent.sockets).length, 1);
assert.strictEqual(Object.keys(agent.requests).length, 0);

Expand All @@ -68,10 +68,10 @@ server.listen(0, common.mustCall(() => {

// TODO(jasnell): This event does not appear to currently be triggered.
// is this handler actually required?
req2.on('error', (err) => {
req2.on('error', common.mustCallAtLeast((err) => {
// This is expected in response to our explicit abort call
assert.strictEqual(err.code, 'ECONNRESET');
});
}, 0));

req2.end();
req2.abort();
Expand All @@ -89,7 +89,7 @@ server.listen(0, common.mustCall(() => {
server.close();
}), 100);
}));
});
}));

req1.end();
}));
8 changes: 4 additions & 4 deletions test/parallel/test-http-abort-stream-end.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@ const server = http.createServer(common.mustCall((req, res) => {
res.end();
}));

server.listen(0, () => {
server.listen(0, common.mustCall(() => {
const res = common.mustCall((res) => {
res.on('data', (chunk) => {
res.on('data', common.mustCallAtLeast((chunk) => {
size += chunk.length;
assert(!req.aborted, 'got data after abort');
if (size > maxSize) {
req.abort();
assert.strictEqual(req.aborted, true);
size = maxSize;
}
});
}));

req.on('abort', common.mustCall(() => assert.strictEqual(size, maxSize)));
assert.strictEqual(req.aborted, false);
});

const req = http.get(`http://localhost:${server.address().port}`, res);
});
}));
4 changes: 2 additions & 2 deletions test/parallel/test-http-agent-error-on-idle.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const server = http.createServer(common.mustCall((req, res) => {
res.end('hello world');
}, 2));

server.listen(0, () => {
server.listen(0, common.mustCall(() => {
const agent = new Agent({ keepAlive: true });

const requestParams = {
Expand Down Expand Up @@ -46,4 +46,4 @@ server.listen(0, () => {
agent.destroy();
server.close();
}
});
}));
4 changes: 2 additions & 2 deletions test/parallel/test-http-agent-keepalive-delay.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ const server = http.createServer(common.mustCall((req, res) => {

server.listen(0, common.mustCall(() => {
const createConnection = agent.createConnection;
agent.createConnection = (options, ...args) => {
agent.createConnection = common.mustCall((options, ...args) => {
assert.strictEqual(options.keepAlive, true);
assert.strictEqual(options.keepAliveInitialDelay, agent.keepAliveMsecs);
return createConnection.call(agent, options, ...args);
};
});
http.get({
host: 'localhost',
port: server.address().port,
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-http-agent-maxsockets.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ function get(path, callback) {
}, callback);
}

const countdown = new Countdown(2, () => {
const countdown = new Countdown(2, common.mustCall(() => {
const freepool = agent.freeSockets[Object.keys(agent.freeSockets)[0]];
assert.strictEqual(freepool.length, 2,
`expect keep 2 free sockets, but got ${freepool.length}`);
agent.destroy();
server.close();
});
}));

function dec() {
process.nextTick(() => countdown.dec());
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-http-agent-maxtotalsockets.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ function start(param = {}) {
server.keepAliveTimeout = 0;
server2.keepAliveTimeout = 0;

const countdown = new Countdown(12, () => {
const countdown = new Countdown(12, common.mustCall(() => {
assert.strictEqual(getRequestCount(), 0);
agent.destroy();
server.close();
server2.close();
});
}));

function handler(s) {
for (let i = 0; i < 6; i++) {
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-http-agent-remove.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const { mustCall } = require('../common');

const http = require('http');
const { strictEqual } = require('assert');
const assert = require('assert');

const server = http.createServer(mustCall((req, res) => {
res.flushHeaders();
Expand All @@ -14,7 +14,7 @@ server.listen(0, mustCall(() => {
}, mustCall(() => {
const { socket } = req;
socket.emit('agentRemove');
strictEqual(socket._httpMessage, req);
assert.strictEqual(socket._httpMessage, req);
socket.destroy();
server.close();
}));
Expand Down
16 changes: 8 additions & 8 deletions test/parallel/test-http-agent-reuse-drained-socket-only.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ function sendFstReq(serverPort) {
agent,
host: '127.0.0.1',
port: serverPort,
}, (res) => {
}, common.mustCall((res) => {
res.on('data', noop);
res.on('end', common.mustCall(() => {
// Agent's socket reusing code is registered to process.nextTick(),
// and will be run after this function, make sure it take effect.
setImmediate(sendSecReq, serverPort, req.socket.localPort);
}));
});
}));

// Make the `req.socket` non drained, i.e. has some data queued to write to
// and accept by the kernel. In Linux and Mac, we only need to call `req.end(aLargeBuffer)`.
Expand All @@ -60,8 +60,8 @@ function sendFstReq(serverPort) {
* back the socket within SO_SNDBUF quota or only one outstanding send condition.
*/

req.on('socket', () => {
req.socket.on('connect', () => {
req.on('socket', common.mustCall(() => {
req.socket.on('connect', common.mustCall(() => {
// Print tcp send buffer information
console.log(process.report.getReport().libuv.filter((handle) => handle.type === 'tcp'));

Expand All @@ -81,8 +81,8 @@ function sendFstReq(serverPort) {

req.end(dataLargerThanTCPSendBuf);
assert.ok(req.socket.writableLength > 0);
});
});
}));
}));
}

function sendSecReq(serverPort, fstReqCliPort) {
Expand All @@ -92,12 +92,12 @@ function sendSecReq(serverPort, fstReqCliPort) {
agent,
host: '127.0.0.1',
port: serverPort,
}, (res) => {
}, common.mustCall((res) => {
res.on('data', noop);
res.on('end', common.mustCall(() => {
setImmediate(sendThrReq, serverPort, req.socket.localPort);
}));
});
}));

req.on('socket', common.mustCall((sock) => {
assert.notStrictEqual(sock.localPort, fstReqCliPort);
Expand Down
48 changes: 24 additions & 24 deletions test/parallel/test-http-agent-scheduling.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@ function defaultTest() {
maxSockets: 5
});

bulkRequest(url, agent, (ports) => {
makeRequest(url, agent, (port) => {
bulkRequest(url, agent, common.mustCall((ports) => {
makeRequest(url, agent, common.mustCall((port) => {
assert.strictEqual(ports[ports.length - 1], port);
makeRequest(url, agent, (port) => {
makeRequest(url, agent, common.mustCall((port) => {
assert.strictEqual(ports[ports.length - 1], port);
makeRequest(url, agent, (port) => {
makeRequest(url, agent, common.mustCall((port) => {
assert.strictEqual(ports[ports.length - 1], port);
server.close();
agent.destroy();
});
});
});
});
}));
}));
}));
}));
}
}

Expand All @@ -82,19 +82,19 @@ function fifoTest() {
scheduling: 'fifo'
});

bulkRequest(url, agent, (ports) => {
makeRequest(url, agent, (port) => {
bulkRequest(url, agent, common.mustCall((ports) => {
makeRequest(url, agent, common.mustCall((port) => {
assert.strictEqual(ports[0], port);
makeRequest(url, agent, (port) => {
makeRequest(url, agent, common.mustCall((port) => {
assert.strictEqual(ports[1], port);
makeRequest(url, agent, (port) => {
makeRequest(url, agent, common.mustCall((port) => {
assert.strictEqual(ports[2], port);
server.close();
agent.destroy();
});
});
});
});
}));
}));
}));
}));
}
}

Expand All @@ -110,19 +110,19 @@ function lifoTest() {
scheduling: 'lifo'
});

bulkRequest(url, agent, (ports) => {
makeRequest(url, agent, (port) => {
bulkRequest(url, agent, common.mustCall((ports) => {
makeRequest(url, agent, common.mustCall((port) => {
assert.strictEqual(ports[ports.length - 1], port);
makeRequest(url, agent, (port) => {
makeRequest(url, agent, common.mustCall((port) => {
assert.strictEqual(ports[ports.length - 1], port);
makeRequest(url, agent, (port) => {
makeRequest(url, agent, common.mustCall((por B3F9 t) => {
assert.strictEqual(ports[ports.length - 1], port);
server.close();
agent.destroy();
});
});
});
});
}));
}));
}));
}));
}
}

Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-http-agent-timeout-option.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const { mustCall } = require('../common');
const { strictEqual } = require('assert');
const assert = require('assert');
const { Agent, get } = require('http');

// Test that the listener that forwards the `'timeout'` event from the socket to
Expand All @@ -14,10 +14,10 @@ const request = get({
});

request.on('socket', mustCall((socket) => {
strictEqual(socket.timeout, 50);
assert.strictEqual(socket.timeout, 50);

const listeners = socket.listeners('timeout');

strictEqual(listeners.length, 2);
strictEqual(listeners[1], request.timeoutCb);
assert.strictEqual(listeners.length, 2);
assert.strictEqual(listeners[1], request.timeoutCb);
}));
8 changes: 4 additions & 4 deletions test/parallel/test-http-agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,20 @@ function makeRequests(outCount, inCount, shouldFail) {
}, outCount * inCount);
});

server.listen(0, () => {
server.listen(0, common.mustCall(() => {
const port = server.address().port;
for (let i = 0; i < outCount; i++) {
setTimeout(() => {
setTimeout(common.mustCall(() => {
for (let j = 0; j < inCount; j++) {
const req = http.get({ port: port, path: '/' }, onRequest);
if (shouldFail)
req.on('error', common.mustCall(onRequest));
else
req.on('error', (e) => assert.fail(e));
}
}, i);
}), i);
}
});
}));
return p;
}

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-http-allow-content-length-304.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const server = http.createServer(common.mustCall((req, res) => {
res.end(null);
}));

server.listen(0, () => {
server.listen(0, common.mustCall(() => {
const request = http.request({
port: server.address().port,
});
Expand All @@ -29,4 +29,4 @@ server.listen(0, () => {
}));

request.end(null);
});
}));
Loading
Loading
0