test: handle EUNATCH

When IPv6 is disabled IBM i returns EUNATCH (errno 42) instead of EADDRNOTAVAIL. libuv 1.46.0 adds EUNATCH errno We can now use error.code to refer to EUNATCH in node versions that use libuv 1.46.0.
nodejs · Jul 6, 2023 · 09207b8 · 09207b8
1 parent d9438cc
commit 09207b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/test/parallel/test-net-autoselectfamily-commandline-option.js b/test/parallel/test-net-autoselectfamily-commandline-option.js
@@ -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)`);
  }
 
  ipv4Server.close();

diff --git a/test/parallel/test-net-autoselectfamily-default.js b/test/parallel/test-net-autoselectfamily-default.js
@@ -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();

diff --git a/test/parallel/test-net-autoselectfamily.js b/test/parallel/test-net-autoselectfamily.js
@@ -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();