Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: handle EUNATCH #48050

Closed
wants to merge 2 commits into from
+6 −8
Closed

test: handle EUNATCH #48050

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09207b8
test: handle EUNATCH
abmusse May 17, 2023
f83b102
fixup! test: handle EUNATCH
abmusse Aug 19, 2023
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
5 changes: 2 additions & 3 deletions test/parallel/test-net-autoselectfamily-commandline-option.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,8 @@ function createDnsServer(ipv6Addr, ipv4Addr, cb) {
assert.strictEqual(error.message, `connect ECONNREFUSED ::1:${port}`);
} else if (error.code === 'EAFNOSUPPORT') {
assert.strictEqual(error.message, `connect EAFNOSUPPORT ::1:${port} - Local (undefined:undefined)`);
} else {
assert.strictEqual(error.code, 'EADDRNOTAVAIL');
assert.strictEqual(error.message, `connect EADDRNOTAVAIL ::1:${port} - Local (:::0)`);
} else if (error.code === 'EADDRNOTAVAIL' || error.code === 'EUNATCH') {
assert.strictEqual(error.message, `connect ${error.code} ::1:${port} - Local (:::0)`);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't match existing code behavior. Should add a separate else if leg like the EAFNOSUPPORT above.

Suggested change
} else if (error.code === 'EADDRNOTAVAIL' || error.code === 'EUNATCH') {
assert.strictEqual(error.message, `connect ${error.code} ::1:${port} - Local (:::0)`);
} else if (error.code === 'EUNATCH') {
assert.strictEqual(error.message, `connect EUNATCH ::1:${port} - Local (:::0)`);
} else {
assert.strictEqual(error.code, 'EADDRNOTAVAIL');
assert.strictEqual(error.message, `connect EADDRNOTAVAIL ::1:${port} - Local (:::0)`);

Either that or merge the EAFNOSUPPORT else block in to this one. The other tests have this same issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the option of adding a separate else leg. Will fix this up!

Copy link
Contributor Author

@abmusse abmusse Aug 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added else if legs for EUNATCH in f83b102

}

ipv4Server.close();
Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-net-autoselectfamily-default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,8 @@ function createDnsServer(ipv6Addr, ipv4Addr, cb) {
assert.strictEqual(error.message, `connect ECONNREFUSED ::1:${port}`);
} else if (error.code === 'EAFNOSUPPORT') {
assert.strictEqual(error.message, `connect EAFNOSUPPORT ::1:${port} - Local (undefined:undefined)`);
} else if (common.isIBMi) {
// IBMi returns EUNATCH (ERRNO 42) when IPv6 is disabled
// keep this errno assertion until EUNATCH is recognized by libuv
assert.strictEqual(error.errno, -42);
} else {
assert.strictEqual(error.code, 'EADDRNOTAVAIL');
assert.strictEqual(error.message, `connect EADDRNOTAVAIL ::1:${port} - Local (:::0)`);
} else if (error.code === 'EADDRNOTAVAIL' || error.code === 'EUNATCH') {
assert.strictEqual(error.message, `connect ${error.code} ::1:${port} - Local (:::0)`);
}

ipv4Server.close();
Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-net-autoselectfamily.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,8 @@ if (common.hasIPv6) {
assert.strictEqual(error.message, `connect ECONNREFUSED ::1:${port}`);
} else if (error.code === 'EAFNOSUPPORT') {
assert.strictEqual(error.message, `connect EAFNOSUPPORT ::1:${port} - Local (undefined:undefined)`);
} else if (common.isIBMi) {
// IBMi returns EUNATCH (ERRNO 42) when IPv6 is disabled
// keep this errno assertion until EUNATCH is recognized by libuv
assert.strictEqual(error.errno, -42);
} else {
assert.strictEqual(error.code, 'EADDRNOTAVAIL');
assert.strictEqual(error.message, `connect EADDRNOTAVAIL ::1:${port} - Local (:::0)`);
} else if (error.code === 'EADDRNOTAVAIL' || error.code === 'EUNATCH') {
assert.strictEqual(error.message, `connect ${error.code} ::1:${port} - Local (:::0)`);
}

ipv4Server.close();
Expand Down