test: fix DNS cancel tests

PR-URL: https://github.com/nodejs/node/pull/44432
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Szymon Marczak
2024-05-11 20:05:59 +02:00
committed by GitHub
parent ff7910b693
commit 8c0ec0f85f
2 changed files with 15 additions and 26 deletions

View File

@@ -7,23 +7,15 @@ const dgram = require('dgram');
const server = dgram.createSocket('udp4');
const resolver = new dnsPromises.Resolver();
const addMessageListener = () => {
server.removeAllListeners('message');
server.once('message', () => {
server.once('message', common.mustNotCall);
resolver.cancel();
});
};
server.bind(0, common.mustCall(async () => {
resolver.setServers([`127.0.0.1:${server.address().port}`]);
addMessageListener();
// Single promise
{
server.once('message', () => {
resolver.cancel();
});
const hostname = 'example0.org';
await assert.rejects(
@@ -36,10 +28,12 @@ server.bind(0, common.mustCall(async () => {
);
}
addMessageListener();
// Multiple promises
{
server.once('message', () => {
resolver.cancel();
});
const assertions = [];
const assertionCount = 10;

View File

@@ -10,16 +10,6 @@ const resolver = new Resolver();
const desiredQueries = 11;
let finishedQueries = 0;
const addMessageListener = () => {
server.removeAllListeners('message');
server.once('message', () => {
server.once('message', common.mustNotCall);
resolver.cancel();
});
};
server.bind(0, common.mustCall(async () => {
resolver.setServers([`127.0.0.1:${server.address().port}`]);
@@ -37,7 +27,9 @@ server.bind(0, common.mustCall(async () => {
const next = (...args) => {
callback(...args);
addMessageListener();
server.once('message', () => {
resolver.cancel();
});
// Multiple queries
for (let i = 1; i < desiredQueries; i++) {
@@ -45,7 +37,10 @@ server.bind(0, common.mustCall(async () => {
}
};
server.once('message', () => {
resolver.cancel();
});
// Single query
addMessageListener();
resolver.resolve4('example0.org', next);
}));